diff -Eru metacity-2.20.0.orig/src/prefs.c metacity-2.20.0/src/prefs.c
--- metacity-2.20.0.orig/src/prefs.c	2007-11-11 14:23:51.000000000 +0000
+++ metacity-2.20.0/src/prefs.c	2007-11-11 21:17:00.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*
diff -Eru metacity-2.20.0.orig/src/window.c metacity-2.20.0/src/window.c
--- metacity-2.20.0.orig/src/window.c	2007-11-11 14:23:51.000000000 +0000
+++ metacity-2.20.0/src/window.c	2007-11-11 21:44:19.000000000 +0000
@@ -2791,9 +2791,7 @@
 
   unminimize_window_and_all_transient_parents (window);
 
-  if (meta_prefs_get_raise_on_click () ||
-      source_indication == META_CLIENT_TYPE_PAGER)
-    meta_window_raise (window);
+   meta_window_raise (window);
 
   meta_topic (META_DEBUG_FOCUS,
               "Focusing window %s due to activation\n",
