diff --git a/core/core.services.yml b/core/core.services.yml
index 9466f95..bed669a 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -267,10 +267,6 @@ services:
     arguments: ['@controller_resolver', '@module_handler', '@cache.discovery', '@language_manager', '@access_manager', '@current_user', '@request_stack']
   plugin.cache_clearer:
     class: Drupal\Core\Plugin\CachedDiscoveryClearer
-  request:
-    class: Symfony\Component\HttpFoundation\Request
-    synthetic: true
-    synchronized: true
   request_stack:
     class: Symfony\Component\HttpFoundation\RequestStack
     tags:
@@ -787,7 +783,7 @@ services:
     arguments: ['@authentication']
   current_user:
     class: Drupal\Core\Session\AccountProxy
-    arguments: ['@authentication', '@request']
+    arguments: ['@authentication', '@request_stack']
   session_manager:
     class: Drupal\Core\Session\SessionManager
     arguments: ['@request_stack', '@database', '@session_manager.metadata_bag', '@settings']
diff --git a/core/lib/Drupal/Core/Session/AccountProxy.php b/core/lib/Drupal/Core/Session/AccountProxy.php
index 9f00218..d74a66d 100644
--- a/core/lib/Drupal/Core/Session/AccountProxy.php
+++ b/core/lib/Drupal/Core/Session/AccountProxy.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Session;
 
 use Drupal\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * A proxied implementation of AccountInterface.
@@ -26,9 +26,9 @@ class AccountProxy implements AccountProxyInterface {
   /**
    * The current request.
    *
-   * @var \Symfony\Component\HttpFoundation\Request
+   * @var \Symfony\Component\HttpFoundation\RequestStack
    */
-  protected $request;
+  protected $requestStack;
 
   /**
    * The authentication manager.
@@ -52,9 +52,9 @@ class AccountProxy implements AccountProxyInterface {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request object used for authenticating.
    */
-  public function __construct(AuthenticationManagerInterface $authentication_manager, Request $request) {
+  public function __construct(AuthenticationManagerInterface $authentication_manager, RequestStack $requestStack) {
     $this->authenticationManager = $authentication_manager;
-    $this->request = $request;
+    $this->requestStack = $requestStack;
   }
 
   /**
@@ -74,7 +74,7 @@ public function setAccount(AccountInterface $account) {
    */
   public function getAccount() {
     if (!isset($this->account)) {
-      $this->setAccount($this->authenticationManager->authenticate($this->request));
+      $this->setAccount($this->authenticationManager->authenticate($this->requestStack->getMasterRequest()));
     }
     return $this->account;
   }