--- metacity-2.21.8/src/core/prefs.c	2008-02-03 04:49:18.000000000 +0000
+++ metacity-2.21.8/src/core/prefs.c.new	2008-02-04 02:32:31.000000000 +0000
@@ -1220,10 +1220,7 @@
 gboolean
 meta_prefs_get_raise_on_click (void)
 {
-  /* Force raise_on_click on for click-to-focus, as requested by Havoc
-   * in #326156.
-   */
-  return raise_on_click || focus_mode == META_FOCUS_MODE_CLICK;
+  return raise_on_click;
 }
 
 const char*