diff --git a/openbox/action.c b/openbox/action.c
index f1066979..85d84798 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -47,18 +47,17 @@ static void client_action_end(union ActionData *data)
 {
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
-            if (!data->any.button && data->any.c) {
+            if (!data->any.button && data->any.c)
                 event_ignore_all_queued_enters();
-            } else {
-                ObClient *c;
+            else {
+                /* we USED to create a fake enter event here, so that when you
+                   used a Press context, and the button was still down,
+                   you could still get enter events that weren't
+                   NotifyWhileGrabbed.
 
-                /* usually this is sorta redundant, but with a press action
-                   that moves windows our from under the cursor, the enter
-                   event will come as a GrabNotify which is ignored, so this
-                   makes a fake enter event
-                */
-                if ((c = client_under_pointer()))
-                    event_enter_client(c);
+                   only problem with this is that then the resulting focus
+                   change events can ALSO be NotifyWhileGrabbed. And that is
+                   bad. So, don't create fake enter events anymore. */
             }
         }
 }