core/core.services.yml                              | 7 ++++---
 core/lib/Drupal/Core/Routing/AccessAwareRouter.php  | 2 +-
 core/tests/Drupal/Tests/Core/Routing/RouterTest.php | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core.services.yml b/core/core.services.yml
index c607fb0..1c1bb9d 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -869,12 +869,13 @@ services:
     deprecated: The "%service_id%" service is deprecated. You should use the 'router.no_access_checks' service instead.
   router.no_access_checks:
     class: \Drupal\Core\Routing\Router
-    arguments: ['@router.route_provider', '@path.current', '@url_generator', '@access_manager', '@current_user', FALSE]
+    parent: router
+    arguments:
+      index_5: FALSE
+    # Tags are not inherited from the parent service. Must be kept in sync.
     tags:
       - { name: service_collector, tag: non_lazy_route_enhancer, call: addRouteEnhancer }
       - { name: service_collector, tag: non_lazy_route_filter, call: addRouteFilter }
-    calls:
-      - [setContext, ['@router.request_context']]
   router.path_roots_subscriber:
     class: Drupal\Core\EventSubscriber\PathRootsSubscriber
     arguments: ['@state']
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 689f4ef..88fa120 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ * @deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.0.
  * Use Drupal\Core\Routing\Router with $check_access in the constructor instead.
  */
 class AccessAwareRouter extends Router {
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouterTest.php b/core/tests/Drupal/Tests/Core/Routing/RouterTest.php
index 641bf26..b3c3751 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouterTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouterTest.php
@@ -155,5 +155,4 @@ public function testCheckAccessResultWithReason() {
     $router->matchRequest($request);
   }
 
-
 }