diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 0160119..4f8c639 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -416,7 +416,15 @@ protected function initializeContainer() {
 
       // If 'container.modules' is wrong, the container must be rebuilt.
       if (!isset($this->moduleList)) {
-        $this->moduleList = $this->container->get('config.factory')->get('system.module')->load()->get('enabled');
+        // The default config factory/storage is cached; if the system.module
+        // configuration was manually updated in order to e.g. remove a faulty
+        // module, then the previously cached system.module configuration would
+        // be returned here, causing DrupalKernel to continuously rebuild the
+        // container on every single page request, even when using the rebuild
+        // script.
+        $this->configStorage = BootstrapConfigStorageFactory::get();
+        $this->moduleList = $this->configStorage->read('system.module');
+        $this->moduleList = !empty($this->moduleList['enabled']) ? $this->moduleList['enabled'] : array();
       }
       if (array_keys($this->moduleList) !== array_keys($container_modules)) {
         $persist = $this->getServicesToPersist();
