diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 78a7ba7..74776cf 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -269,8 +269,7 @@ public static function createFromRequest(Request $request, $class_loader, $envir
     // Get our most basic settings setup.
     $site_path = static::findSitePath($request);
     $kernel->setSitePath($site_path);
-    $settings['bootstrap_container_definition'] = static::$bootstrapContainerDefinition;
-    Settings::initialize(dirname($core_root), $site_path, $class_loader, $settings);
+    Settings::initialize(dirname($core_root), $site_path, $class_loader);
 
     // Initialize our list of trusted HTTP Host headers to protect against
     // header attacks.
@@ -474,7 +473,6 @@ public function boot() {
     FileCacheFactory::setConfiguration($configuration);
     FileCacheFactory::setPrefix(Settings::getApcuPrefix('file_cache', $this->root));
 
-    // @todo Drush does not use the settings.php way ...
     $this->bootstrapContainer = new PhpArrayContainer(Settings::get('bootstrap_container_definition', static::$bootstrapContainerDefinition));
 
     // Initialize the container.
diff --git a/core/lib/Drupal/Core/Site/Settings.php b/core/lib/Drupal/Core/Site/Settings.php
index f53356f..63e13db 100644
--- a/core/lib/Drupal/Core/Site/Settings.php
+++ b/core/lib/Drupal/Core/Site/Settings.php
@@ -112,11 +112,12 @@ public static function getAll() {
    *
    * @see default.settings.php
    */
-  public static function initialize($app_root, $site_path, &$class_loader, $settings = []) {
+  public static function initialize($app_root, $site_path, &$class_loader) {
     // Export these settings.php variables to the global namespace.
     global $base_url, $config_directories, $config;
     $config = array();
     $databases = array();
+    $settings = array();
 
     // Make conf_path() available as local variable in settings.php.
     if (is_readable($app_root . '/' . $site_path . '/settings.php')) {