diff --git a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php b/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
index 8b8e49d..fefc765 100755
--- a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
+++ b/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
@@ -72,7 +72,7 @@ public function onRequest(GetResponseEvent $event) {
       // Only act on html pages.
       return;
     }
-    global $user;
+    $user = $request->attributes->get('_account');
 
     $mode = overlay_get_mode();
 
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 2edb256..c73cace 100755
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -229,7 +229,7 @@ function overlay_page_alter(&$page) {
  * @see http://drupal.org/node/890284
  */
 function overlay_disable_message() {
-  global $user;
+  $user = Drupal::request()->attributes->get('_account');
 
   $build = array();
   if ($user->isAnonymous() || !user_access('access overlay')) {