diff --git a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php b/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
index 18a392b..a2d70c2 100644
--- 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 = \Drupal::currentUser();
 
     $mode = overlay_get_mode();
 
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index efa5280..329e751 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -215,7 +215,7 @@ function overlay_page_alter(&$page) {
  * @see http://drupal.org/node/890284
  */
 function overlay_disable_message() {
-  global $user;
+  $user = Drupal::currentUser();
 
   $build = array();
   if ($user->isAnonymous() || !$user->hasPermission('access overlay')) {