diff --git a/ChangeLog b/ChangeLog
index 15aae751f..dcaae2744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-29  Elijah Newren  <newren@math.utah.edu>
+
+	* src/window.c (window_takes_focus_on_map): Disable
+	focus-stealing-prevention for now; there are still some issues and
+	hard code freeze is tomorrow...so this will have to wait until
+	Gnome 2.10.
+
 2004-08-27  Havoc Pennington  <hp@redhat.com>
 
 	* src/compositor.c (meta_compositor_new): disable NameWindowPixmap
diff --git a/src/window.c b/src/window.c
index 41988685c..5af689ce0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1621,6 +1621,9 @@ window_takes_focus_on_map (MetaWindow *window)
     case META_WINDOW_NORMAL:
     case META_WINDOW_DIALOG:
     case META_WINDOW_MODAL_DIALOG:
+      /* Disable the focus-stealing-prevention stuff for now; see #149028 */
+      return TRUE;
+
       meta_topic (META_DEBUG_STARTUP,
                   "COMPARISON:\n"
                   "  net_wm_user_time_set : %d\n"