diff --git a/core/core.services.yml b/core/core.services.yml
index deb8b77..b73e700 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -196,7 +196,6 @@ services:
   plugin.manager.menu.local_task:
     class: Drupal\Core\Menu\LocalTaskManager
     arguments: ['@controller_resolver', '@request', '@router.route_provider', '@module_handler', '@cache.cache', '@language_manager', '@access_manager', '@current_user']
-    scope: request
   request:
     class: Symfony\Component\HttpFoundation\Request
     synthetic: true
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
index 3e5b590..48c116e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -80,11 +80,14 @@ public function testPageResponses() {
     $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
     $this->assertEqual($response->getStatusCode(), 200);
 
+    $subrequest = Request::create('/test_page_display_200', 'GET');
+    \Drupal::getContainer()->set('request', $subrequest);
+
     // Test accessing a disabled page for a view.
     $view = views_get_view('test_page_display');
     // Disable the view, rebuild menu, and request the page again.
     $view->storage->disable()->save();
-    $subrequest = Request::create('/test_page_display_200', 'GET');
+
     $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
     $this->assertEqual($response->getStatusCode(), 404);
   }