diff --git a/core/modules/user/src/UserData.php b/core/modules/user/src/UserData.php
index 3418c83..c22b589 100644
--- a/core/modules/user/src/UserData.php
+++ b/core/modules/user/src/UserData.php
@@ -77,6 +77,13 @@ public function get($module, $uid = NULL, $name = NULL) {
   /**
    * {@inheritdoc}
    */
+  public function getUserDataQuery() {
+    return new UserDataQuery($this->connection->select('users_data', 'ud'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function set($module, $uid, $name, $value) {
     $serialized = 0;
     if (!is_scalar($value)) {
diff --git a/core/modules/user/src/UserDataInterface.php b/core/modules/user/src/UserDataInterface.php
index 24cd45d..453ac8f 100644
--- a/core/modules/user/src/UserDataInterface.php
+++ b/core/modules/user/src/UserDataInterface.php
@@ -32,6 +32,15 @@
   public function get($module, $uid = NULL, $name = NULL);
 
   /**
+   * Gets an object that allows the user data to be queried.
+   *
+   * @return \Drupal\user\UserDataQueryInterface
+   *   An object implementing UserDataQueryInterface that allows the user data
+   *   to be queried.
+   */
+  public function getUserDataQuery();
+
+  /**
    * Stores data for a user account.
    *
    * @param string $module
diff --git a/core/modules/user/tests/src/Kernel/UserDataQueryTest.php b/core/modules/user/tests/src/Kernel/UserDataQueryTest.php
index eb1bf7c..f560992 100644
--- a/core/modules/user/tests/src/Kernel/UserDataQueryTest.php
+++ b/core/modules/user/tests/src/Kernel/UserDataQueryTest.php
@@ -6,6 +6,7 @@
 
 /**
  * @coversDefaultClass \Drupal\user\UserData
+ *
  * @group user
  */
 class UserDataQueryTest extends KernelTestBase {
@@ -32,7 +33,7 @@ public function testUserDataQuery($contents, $module, $uid, $name, $value, $expe
     foreach ($contents as $row) {
       $user_data->set($row['module'], $row['uid'], $row['name'], $row['value']);
     }
-    $user_data_query = \Drupal::service('user.data.query');
+    $user_data_query = $user_data->getUserDataQuery();
     if (isset($module)) {
       $user_data_query->module($module);
     }
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 5f0ce2e..c273cb3 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -25,13 +25,6 @@ services:
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
-  user.data.query:
-    class: Drupal\user\UserDataQuery
-    shared: false
-    tags:
-      - { name: backend_overridable }
-    factory: ['Drupal\user\UserDataQuery', 'create']
-    arguments: ['@database']
   user_maintenance_mode_subscriber:
     class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
     arguments: ['@maintenance_mode', '@current_user']