diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 0555d0b..5cd7a20 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -97,9 +97,8 @@ public function __construct(RequestStack $request_stack, Connection $connection,
     $save_handler = new SessionHandler($this, $this->requestStack, $this->connection);
     $write_check_handler = new WriteCheckSessionHandler($save_handler);
     $this->writeBarrierHandler = new WriteBarrierSessionHandler($write_check_handler);
-    $this->setSaveHandler($this->writeBarrierHandler);
 
-    parent::__construct($options, $write_check_handler, $metadata_bag);
+    parent::__construct($options, $this->writeBarrierHandler, $metadata_bag);
 
     $this->setMixedMode($settings->get('mixed_mode_sessions', FALSE));
 
@@ -315,7 +314,7 @@ public function isEnabled() {
    * {@inheritdoc}
    */
   public function disable() {
-    return $this->writeBarrierHandler->setSessionWritable(FALSE);
+    $this->writeBarrierHandler->setSessionWritable(FALSE);
     return $this;
   }
 
@@ -323,7 +322,7 @@ public function disable() {
    * {@inheritdoc}
    */
   public function enable() {
-    return $this->writeBarrierHandler->setSessionWritable(TRUE);
+    $this->writeBarrierHandler->setSessionWritable(TRUE);
     return $this;
   }