diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 0dd19d5..eac2f97 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2477,6 +2477,9 @@ function drupal_container(Container $new_container = NULL, $rebuild = FALSE) {
     $container
       ->register('keyvalue.database', 'Drupal\Core\KeyValueStore\KeyValueDatabaseFactory')
       ->addArgument(new Reference('database'));
+
+    // Register the EntityManager.
+    $container->register('plugin.manager.entity', 'Drupal\Core\Entity\EntityManager');
   }
   return $container;
 }
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 0225c9b..5a07c55 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -70,8 +70,6 @@ public function build(ContainerBuilder $container) {
       ->addArgument(new Reference('router.dumper'))
       ->addArgument(new Reference('lock'));
 
-    $container->register('plugin.manager.entity', 'Drupal\Core\Entity\EntityManager');
-
     $container->register('matcher', 'Drupal\Core\Routing\ChainMatcher');
     $container->register('legacy_url_matcher', 'Drupal\Core\LegacyUrlMatcher')
       ->addTag('chained_matcher');