diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index d14f7f8..71a49a1 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1046,7 +1046,6 @@ function theme_get_setting($setting_name, $theme = NULL) {
  * Converts theme settings to configuration.
  *
  * @see system_theme_settings_submit()
- * @see system_update_8054()
  *
  * @param array $theme_settings
  *   An array of theme settings from system setting form or a Drupal 7 variable.
diff --git a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
index c25763d..a8334b8 100644
--- a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
@@ -71,10 +71,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
     $schema_store = \Drupal::keyValue('system.schema');
     $old_schema = array();
     foreach ($module_list as $module) {
-      // Check for initial schema and install it. The schema version of a newly
-      // installed module is always 0. Using 8000 here would be inconsistent
-      // since $module_update_8000() may involve a schema change, and we want
-      // to install the schema as it was before any updates were added.
+      // Check for initial schema and install it.
       module_load_install($module);
       $function = $module . '_schema_0';
       if (function_exists($function)) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
index ef2f136..463b486 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
@@ -289,7 +289,7 @@ public function getSystemSchema() {
           'default' => 0,
         ),
         'schema_version' => array(
-          'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
+          'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); \Drupal::CORE_MINIMUM_SCHEMA_VERSION or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
           'type' => 'int',
           'not null' => TRUE,
           'default' => -1,