diff --git a/core/core.services.yml b/core/core.services.yml
index 91deb95..81883a3 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -416,7 +416,7 @@ services:
     lazy: true
   module_listing:
     class: Drupal\Core\Extension\ModuleExtensionList
-    arguments: ['@app.root', 'module', '@cache.default', '@info_parser', '@module_handler']
+    arguments: ['@app.root', 'module', '@cache.default', '@info_parser', '@module_handler', '@config.factory']
   content_uninstall_validator:
     class: Drupal\Core\Entity\ContentUninstallValidator
     tags:
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 00a8e10..34dd9cc 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -899,10 +899,10 @@ function system_rebuild_module_data() {
   // reference from system_list_reset() during the rebuild.
   if (!isset($modules_cache)) {
     \Drupal::service('module_listing')->reset();
-    $modules = \Drupal::service('module_listing')->listExtensions();
+    $modules_cache = \Drupal::service('module_listing')->listExtensions();
     $files = array();
-    ksort($modules);
-    foreach ($modules as $name => $module) {
+    ksort($modules_cache);
+    foreach ($modules_cache as $name => $module) {
       $files[$name] = $module->getPathname();
     }
     // Store filenames to allow system_list() and drupal_get_filename() to