diff --git a/core/modules/user/lib/Drupal/user/UserBundle.php b/core/modules/user/lib/Drupal/user/UserBundle.php
index 4e356b2..1789dec 100644
--- a/core/modules/user/lib/Drupal/user/UserBundle.php
+++ b/core/modules/user/lib/Drupal/user/UserBundle.php
@@ -8,6 +8,7 @@
 namespace Drupal\user;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -21,7 +22,7 @@ class UserBundle extends Bundle {
   public function build(ContainerBuilder $container) {
     $container
       ->register('user.data', 'Drupal\user\UserData')
-      ->addArgument('database');
+      ->addArgument(new Reference('database'));
   }
 
 }
diff --git a/core/modules/user/lib/Drupal/user/UserDataInterface.php b/core/modules/user/lib/Drupal/user/UserDataInterface.php
index a12eba5..b56baf4 100644
--- a/core/modules/user/lib/Drupal/user/UserDataInterface.php
+++ b/core/modules/user/lib/Drupal/user/UserDataInterface.php
@@ -12,7 +12,7 @@
 /**
  * Defines the user data service interface.
  */
-class UserDataInterface {
+interface UserDataInterface {
 
   /**
    * Returns data stored for a user account.