diff --git a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
index 074ba93..eb63fa9 100644
--- a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
@@ -41,9 +41,6 @@ public function getImplementations($hook) {
         return array('system');
       // This is called during rebuild to find testing themes.
       case 'system_theme_info':
-      // @todo: remove this.
-      case 'entity_info':
-        return array();
       // t() in system_stream_wrappers() needs this. Other schema calls aren't
       // supported.
       case 'schema':
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index 95045f7..300986b 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -662,9 +662,6 @@ function user_update_8011() {
       // Install image.module with schema version 8002 as a previous version
       // would have to create tables that would be removed again.
       update_set_schema('image', 8002);
-      // If image.module was not installed before, install default
-      // configuration and run the install hook.
-      config_install_default_config('module', 'image');
       // Inlined version of image_install(), make sure that the styles
       // directory exists.
       $directory = update_variable_get('file_default_scheme', 'public') . '://styles';