diff --git a/src/core/display-private.h b/src/core/display-private.h
index 89468f57d..4e966c81e 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -175,7 +175,6 @@ struct _MetaDisplay
    * ignore
    */
   unsigned long ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS];
-  Window ungrab_should_not_cause_focus_window;
 
   guint32 current_time;
 
diff --git a/src/core/display.c b/src/core/display.c
index 936100a2f..3c0e2ab06 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -651,7 +651,6 @@ meta_display_open (void)
       display->ignored_crossing_serials[i] = 0;
       ++i;
     }
-  display->ungrab_should_not_cause_focus_window = None;
 
   display->current_time = CurrentTime;
   display->sentinel_counter = 0;
diff --git a/src/core/window.c b/src/core/window.c
index f5bc71182..38de68b86 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7559,8 +7559,6 @@ reset_ignored_crossing_serials (MetaDisplay *display)
       display->ignored_crossing_serials[i] = 0;
       ++i;
     }
-
-  display->ungrab_should_not_cause_focus_window = None;
 }
 
 typedef struct
diff --git a/src/x11/events.c b/src/x11/events.c
index 5b5cf4b23..5d5a5dcb5 100644
--- a/src/x11/events.c
+++ b/src/x11/events.c
@@ -1717,16 +1717,6 @@ meta_display_handle_xevent (MetaDisplay *display,
                       event->xany.serial);
         }
     }
-  else if (input_event &&
-           input_event->evtype == XI_Leave &&
-           ((XILeaveEvent *)input_event)->mode == XINotifyUngrab &&
-           modified == display->ungrab_should_not_cause_focus_window)
-    {
-      meta_display_add_ignored_crossing_serial (display, event->xany.serial);
-      meta_topic (META_DEBUG_FOCUS,
-                  "Adding LeaveNotify serial %lu to ignored focus serials\n",
-                  event->xany.serial);
-    }
 
 #ifdef HAVE_XI23
   if (meta_display_process_barrier_xevent (display, input_event))