diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 0fc9b7c..c014e4a 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -632,9 +632,6 @@ public function updateModules(array $module_list, array $module_filenames = arra
     // and container.
     if ($this->booted) {
       $this->initializeContainer(TRUE);
-      if ($this->containerNeedsDumping && !$this->dumpDrupalContainer($this->container, static::CONTAINER_BASE_CLASS)) {
-        $this->container->get('logger.factory')->get('DrupalKernel')->notice('Container cannot be written to disk');
-      }
     }
   }
 
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 21a0e00..b56cdd5 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -892,8 +892,6 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
       $this->invokeAll('modules_installed', array($modules_installed));
     }
 
-    \Drupal::service('router.builder')->setRebuildNeeded();
-
     return TRUE;
   }
 
@@ -1000,6 +998,9 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
       // Remove any potential cache bins provided by the module.
       $this->removeCacheBins($module);
 
+      // Update the kernel to exclude the uninstalled modules.
+      $this->updateKernel($module_filenames);
+
       // Clear the static cache of system_rebuild_module_data() to pick up the
       // new module, since it merges the installation status of modules into
       // its statically cached list.
@@ -1009,9 +1010,6 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
       \Drupal::getContainer()->get('plugin.cache_clearer')->clearCachedDefinitions();
       \Drupal::service('router.builder_indicator')->setRebuildNeeded();
 
-      // Update the kernel to exclude the uninstalled modules.
-      $this->updateKernel($module_filenames);
-
       // Update the theme registry to remove the newly uninstalled module.
       drupal_theme_rebuild();