diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 07a7a37..cfd749d 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -1191,13 +1191,6 @@ protected function getConfigStorage() {
   }
 
   /**
-   * Gets the module list.
-   */
-  protected function getModuleList() {
-
-  }
-
-  /**
    * Returns an array of Extension class parameters for all enabled modules.
    *
    * @return array
@@ -1269,7 +1262,6 @@ protected function classLoaderAddMultiplePsr4(array $namespaces = array()) {
   }
 
   /**
-<<<<<<< ours
    * Validates a hostname length.
    *
    * @param string $host
@@ -1322,6 +1314,9 @@ public static function validateHostname(Request $request) {
    * @return array|bool
    */
   protected function ensureModuleList() {
+    if (isset($this->moduleList)) {
+      return $this->moduleList;
+    }
     $extensions = $this->getConfigStorage()->read('core.extension');
     return isset($extensions['module']) ? $extensions['module'] : [];
   }