diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 3e48b75..0160119 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -520,8 +520,6 @@ protected function buildContainer() {
     $container->register('class_loader')->setSynthetic(TRUE);
     $container->register('kernel', 'Symfony\Component\HttpKernel\KernelInterface')->setSynthetic(TRUE);
     $container->register('service_container', 'Symfony\Component\DependencyInjection\ContainerInterface')->setSynthetic(TRUE);
-    // Register the kernel-level config storage.
-    $container->set('kernel.config.storage', $this->configStorage);
     $yaml_loader = new YamlFileLoader($container);
     foreach ($this->serviceYamls as $filename) {
       $yaml_loader->load($filename);
diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index 0d913b1..d21cb9f 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -37,13 +37,6 @@ class LanguageManager implements LanguageManagerInterface {
   protected $defaultLanguage;
 
   /**
-   * Constructs a new LanguageManager object.
-   */
-  public function __construct() {
-    $this->defaultLanguage = new Language(Language::$defaultValues);
-  }
-
-  /**
    * {@inheritdoc}
    */
   function setTranslation(TranslationInterface $translation) {
@@ -83,7 +76,7 @@ public function getLanguageTypes() {
    * {@inheritdoc}
    */
   public function getCurrentLanguage($type = Language::TYPE_INTERFACE) {
-    return $this->defaultLanguage;
+    return $this->getDefaultLanguage();
   }
 
   /**
@@ -96,6 +89,9 @@ public function reset($type = NULL) {
    * {@inheritdoc}
    */
   public function getDefaultLanguage() {
+    if (!isset($this->defaultLanguage)) {
+      $this->defaultLanguage = new Language(Language::$defaultValues);
+    }
     return $this->defaultLanguage;
   }
 
diff --git a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php
index d223580..adcefae 100644
--- a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php
+++ b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php
@@ -63,7 +63,7 @@ public function alter(ContainerBuilder $container) {
    */
   protected function isMultilingual(ContainerBuilder $container) {
     $prefix = 'language.entity.';
-    $config_ids = array_filter($container->get('kernel.config.storage')->listAll($prefix), function($config_id) use ($prefix) {
+    $config_ids = array_filter($container->get('config.storage')->listAll($prefix), function($config_id) use ($prefix) {
       return $config_id != $prefix . Language::LANGCODE_NOT_SPECIFIED && $config_id != $prefix . Language::LANGCODE_NOT_APPLICABLE;
     });
     return count($config_ids) > 1;