diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h
index 6b6ee088c..c34e1cffe 100644
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -144,8 +144,6 @@ MetaIdleManager * meta_backend_get_idle_manager (MetaBackend *backend);
 META_EXPORT_TEST
 MetaColorManager * meta_backend_get_color_manager (MetaBackend *backend);
 
-META_EXPORT_TEST
-MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
 MetaCursorRenderer * meta_backend_get_cursor_renderer_for_device (MetaBackend        *backend,
                                                                   ClutterInputDevice *device);
 META_EXPORT_TEST
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index b1475ced9..093b6279f 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -1442,6 +1442,12 @@ meta_backend_get_orientation_manager (MetaBackend *backend)
   return priv->orientation_manager;
 }
 
+/**
+ * meta_backend_get_cursor_tracker:
+ * @backend: a #MetaBackend
+ *
+ * Returns: (transfer none): The cursor tracker corresponding to @backend
+ */
 MetaCursorTracker *
 meta_backend_get_cursor_tracker (MetaBackend *backend)
 {
diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c
index e6c30aa69..a983a11f0 100644
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -311,26 +311,6 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
                                               G_TYPE_NONE, 0);
 }
 
-/**
- * meta_cursor_tracker_get_for_display:
- * @display: the #MetaDisplay
- *
- * Retrieves the cursor tracker object for @display.
- *
- * Returns: (transfer none): the cursor tracker object for @display.
- */
-MetaCursorTracker *
-meta_cursor_tracker_get_for_display (MetaDisplay *display)
-{
-  MetaContext *context = meta_display_get_context (display);
-  MetaBackend *backend = meta_context_get_backend (context);
-  MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
-
-  g_assert (tracker);
-
-  return tracker;
-}
-
 static void
 set_window_cursor (MetaCursorTracker *tracker,
                    gboolean           has_cursor,
diff --git a/src/meta/meta-backend.h b/src/meta/meta-backend.h
index 07719d67d..e77c70af9 100644
--- a/src/meta/meta-backend.h
+++ b/src/meta/meta-backend.h
@@ -99,3 +99,6 @@ MetaBackendCapabilities meta_backend_get_capabilities (MetaBackend *backend);
 
 META_EXPORT
 void meta_backend_renderdoc_capture (MetaBackend *backend);
+
+META_EXPORT
+MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
diff --git a/src/meta/meta-cursor-tracker.h b/src/meta/meta-cursor-tracker.h
index 4631f508d..f99afaabc 100644
--- a/src/meta/meta-cursor-tracker.h
+++ b/src/meta/meta-cursor-tracker.h
@@ -36,9 +36,6 @@ G_DECLARE_DERIVABLE_TYPE (MetaCursorTracker,
                           META, CURSOR_TRACKER,
                           GObject)
 
-META_EXPORT
-MetaCursorTracker *meta_cursor_tracker_get_for_display (MetaDisplay *display);
-
 META_EXPORT
 void           meta_cursor_tracker_get_hot    (MetaCursorTracker *tracker,
                                                int               *x,
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 5005846fa..c97b5e6a6 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -3195,7 +3195,9 @@ meta_window_x11_property_notify (MetaWindow *window,
 static int
 query_pressed_buttons (MetaWindow *window)
 {
-  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_display (window->display);
+  MetaContext *context = meta_display_get_context (window->display);
+  MetaBackend *backend = meta_context_get_backend (context);
+  MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
   ClutterModifierType mods;
   int button = 0;