diff --git a/core/core.services.yml b/core/core.services.yml
index 9c7abad..c3b554d 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1027,7 +1027,7 @@ services:
     arguments: ['%session.storage.options%']
   session_manager:
     class: Drupal\Core\Session\SessionManager
-    arguments: ['@request_stack', '@database', '@session_manager.metadata_bag', '@session_configuration', '@settings']
+    arguments: ['@request_stack', '@database', '@session_manager.metadata_bag', '@session_configuration']
     tags:
       - { name: backend_overridable }
   session_manager.metadata_bag:
diff --git a/core/lib/Drupal/Core/Session/SessionConfiguration.php b/core/lib/Drupal/Core/Session/SessionConfiguration.php
index b3fda20..7e4a8ce 100644
--- a/core/lib/Drupal/Core/Session/SessionConfiguration.php
+++ b/core/lib/Drupal/Core/Session/SessionConfiguration.php
@@ -20,15 +20,6 @@ class SessionConfiguration implements SessionConfigurationInterface {
   protected $options;
 
   /**
-   * Whether or not the session manager is operating in mixed mode SSL.
-   *
-   * @todo Remove mixed mode ssl support (https://www.drupal.org/node/2342593)
-   *
-   * @var bool
-   */
-  protected $mixedMode;
-
-  /**
    * Constructs a new session configuration instance.
    *
    * @param array $options
@@ -45,15 +36,7 @@ public function __construct($options = []) {
    * {@inheritdoc}
    */
   public function hasSession(Request $request) {
-    // @todo Remove mixed mode ssl support (https://www.drupal.org/node/2342593)
-    if ($this->isMixedMode() && $request->cookies->get($this->getInsecureName($request))) {
-      return TRUE;
-    }
-    elseif ($request->cookies->get($this->getName($request))) {
-      return TRUE;
-    }
-
-    return FALSE;
+    return $request->cookies->has($this->getName($request));
   }
 
   /**
@@ -76,45 +59,6 @@ public function getOptions(Request $request) {
   }
 
   /**
-   * Returns whether mixed mode SSL sessions are enabled in the session manager.
-   *
-   * @todo Remove mixed mode ssl support (https://www.drupal.org/node/2342593)
-   *
-   * @return bool
-   *   Value of the mixed mode SSL sessions flag.
-   */
-  public function isMixedMode() {
-    return $this->mixedMode;
-  }
-
-  /**
-   * Enables or disables mixed mode SSL sessions in the session manager.
-   *
-   * @todo Remove mixed mode ssl support (https://www.drupal.org/node/2342593)
-   *
-   * @param bool $mixed_mode
-   *   New value for the mixed mode SSL sessions flag.
-   */
-  public function setMixedMode($mixed_mode) {
-    $this->mixedMode = (bool) $mixed_mode;
-  }
-
-  /**
-   * Returns the name of the insecure session when operating in mixed mode SSL.
-   *
-   * @todo Remove mixed mode ssl support (https://www.drupal.org/node/2342593)
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request.
-   *
-   * @return string
-   *   The name of the insecure session.
-   */
-  protected function getInsecureName(Request $request) {
-    return 'SESS' . $this->getUnprefixedName($request);
-  }
-
-  /**
    * Returns the session cookie name.
    *
    * @return string
@@ -213,4 +157,5 @@ protected function getCookieDomain(Request $request) {
   protected function drupalValidTestUa() {
     return drupal_valid_test_ua();
   }
+
 }
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 74d5dd6..c354cec 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Session\SessionHandler;
-use Drupal\Core\Site\Settings;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
@@ -85,10 +84,8 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   The session metadata bag.
    * @param \Drupal\Core\Session\SessionConfigurationInterface $session_configuration
    *   The session configuration interface.
-   * @param \Drupal\Core\Site\Settings $settings
-   *   The settings instance.
    */
-  public function __construct(RequestStack $request_stack, Connection $connection, MetadataBag $metadata_bag, SessionConfigurationInterface $session_configuration, Settings $settings) {
+  public function __construct(RequestStack $request_stack, Connection $connection, MetadataBag $metadata_bag, SessionConfigurationInterface $session_configuration) {
     $options = array();
     $this->sessionConfiguration = $session_configuration;
     $this->requestStack = $request_stack;