diff --git a/core/includes/common.inc b/core/includes/common.inc
index 97b73f4..acf57da 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -4838,9 +4838,6 @@ function _drupal_bootstrap_code() {
   require_once DRUPAL_ROOT . '/core/includes/schema.inc';
   require_once DRUPAL_ROOT . '/core/includes/entity.inc';
 
-  // Load all enabled modules
-  drupal_container()->get('module_handler')->loadAll();
-
   // Make sure all stream wrappers are registered.
   file_get_stream_wrappers();
 
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index c45c1cd..aa4d7f7 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -83,6 +83,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    */
   public function __construct(array $module_list = array()) {
     $this->moduleList = $module_list;
+    $this->loadAll();
   }
 
   /**