diff --git a/core/includes/update.inc b/core/includes/update.inc
index cdcae63..f1671b8 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -1189,14 +1189,8 @@ function update_retrieve_dependencies() {
   $return = array();
   // Get a list of installed modules, arranged so that we invoke their hooks in
   // the same order that module_invoke_all() does.
-  foreach (drupal_container()->get('keyvalue')->get('system.schema')->getAll() as $module => $schema) {
-    if ($schema == SCHEMA_UNINSTALLED) {
-      // Nothing to upgrade.
-      continue;
-    }
-     $function = $module . '_update_dependencies';
-    // Ensure install file is loaded.
-    module_load_install($module);
+  foreach (config('system.module')->get('enabled') as $module => $weight) {
+    $function = $module . '_update_dependencies';
     if (function_exists($function)) {
       $result = $function();
       // Each implementation of hook_update_dependencies() returns a
diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index a607302..b439bb6 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -505,10 +505,8 @@ function locale_update_8004() {
       $negotiation = update_variable_get('language_negotiation_' . $type, NULL);
       if (!empty($negotiation)) {
         foreach ($negotiation as $method_id => &$method) {
-          if (isset($method['callbacks']['language'])) {
-            $method['callbacks']['negotiation'] = $method['callbacks']['language'];
-            unset($method['callbacks']['language']);
-          }
+          $method['callbacks']['negotiation'] = $method['callbacks']['language'];
+          unset($method['callbacks']['language']);
           if (isset($method['callbacks']['switcher'])) {
             $method['callbacks']['language_switch'] = $method['callbacks']['switcher'];
             unset($method['callbacks']['switcher']);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
index c85c912..c4c6f75 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
@@ -53,6 +53,5 @@ public function testDisabledUpgrade() {
     require_once DRUPAL_ROOT . '/core/includes/install.inc';
     $updates = update_get_update_list();
     $this->assertEqual($updates, array(), 'No pending updates after enabling all modules.');
-    $this->assertTrue(state()->get('update_test_1_update_dependencies_run'), 'Module update dependencies resolved for disabled modules');
   }
 }
diff --git a/core/modules/system/tests/modules/update_test_1/update_test_1.install b/core/modules/system/tests/modules/update_test_1/update_test_1.install
index bf0beb3..22398a3 100644
--- a/core/modules/system/tests/modules/update_test_1/update_test_1.install
+++ b/core/modules/system/tests/modules/update_test_1/update_test_1.install
@@ -11,7 +11,6 @@
  * @see update_test_2_update_dependencies()
  */
 function update_test_1_update_dependencies() {
-  state()->set('update_test_1_update_dependencies_run', TRUE);
   // These dependencies are used in combination with those declared in
   // update_test_2_update_dependencies() for the sole purpose of testing that
   // the results of hook_update_dependencies() are collected correctly and have
diff --git a/core/modules/system/tests/upgrade/drupal-7.all-disabled.database.php b/core/modules/system/tests/upgrade/drupal-7.all-disabled.database.php
index b73db60..26b819e 100644
--- a/core/modules/system/tests/upgrade/drupal-7.all-disabled.database.php
+++ b/core/modules/system/tests/upgrade/drupal-7.all-disabled.database.php
@@ -18,11 +18,3 @@
   ->condition('name', array('filter', 'field', 'field_sql_storage', 'entity',
     'system', 'text', 'user'), 'NOT IN')
   ->execute();
-
-db_update('system')
-  ->fields(array(
-    'schema_version' => 0,
-  ))
-  ->condition('type', 'module')
-  ->condition('name', 'update_test_1')
-  ->execute();