diff --git a/gdk/x11/gdkdevice-xi2-private.h b/gdk/x11/gdkdevice-xi2-private.h
index c9f6bef357..1ca4dc033d 100644
--- a/gdk/x11/gdkdevice-xi2-private.h
+++ b/gdk/x11/gdkdevice-xi2-private.h
@@ -2,8 +2,7 @@
 #define __GDK_DEVICE_XI2_PRIVATE_H__
 
 void gdk_x11_device_xi2_query_state (GdkDevice        *device,
-                                     GdkSurface        *surface,
-                                     GdkSurface       **child_surface,
+                                     GdkSurface       *surface,
                                      double           *win_x,
                                      double           *win_y,
                                      GdkModifierType  *mask);
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 49f900178d..0102f65c7a 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -202,7 +202,6 @@ gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device,
 void
 gdk_x11_device_xi2_query_state (GdkDevice        *device,
                                 GdkSurface        *surface,
-                                GdkSurface       **child_surface,
                                 double           *win_x,
                                 double           *win_y,
                                 GdkModifierType  *mask)
@@ -265,9 +264,6 @@ gdk_x11_device_xi2_query_state (GdkDevice        *device,
       XDestroyWindow (xdisplay, w);
     }
 
-  if (child_surface)
-    *child_surface = gdk_x11_surface_lookup_for_display (display, xchild_window);
-
   if (win_x)
     *win_x = xwin_x / scale;
 
diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 9f6a5f5fdf..639d62f194 100644
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -2011,7 +2011,7 @@ _gdk_x11_surface_drag_begin (GdkSurface         *surface,
 
   precache_target_list (drag);
 
-  gdk_x11_device_xi2_query_state (device, surface, NULL, &px, &py, NULL);
+  gdk_x11_device_xi2_query_state (device, surface, &px, &py, NULL);
 
   gdk_x11_surface_get_root_coords (surface,
                                    round (px + dx),
@@ -2271,7 +2271,7 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
    * to query it here. We could use XGetModifierMapping, but
    * that would be overkill.
    */
-  gdk_x11_device_xi2_query_state (pointer, NULL, NULL, NULL, NULL, &state);
+  gdk_x11_device_xi2_query_state (pointer, NULL, NULL, NULL, &state);
 
   if (dx != 0 || dy != 0)
     {
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index d7ed8d034a..3e9d83ad24 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -2668,7 +2668,7 @@ gdk_x11_surface_get_device_state (GdkSurface     *surface,
   if (GDK_SURFACE_DESTROYED (surface))
     return FALSE;
 
-  gdk_x11_device_xi2_query_state (device, surface, NULL, x, y, mask);
+  gdk_x11_device_xi2_query_state (device, surface, x, y, mask);
 
   return *x >= 0 && *y >= 0 && *x < surface->width && *y < surface->height;
 }