diff --git a/core/lib/Drupal/Core/Routing/RequestContext.php b/core/lib/Drupal/Core/Routing/RequestContext.php
index 2092cbe0cf3de8eee469388a65cc9012a14156c7..a92c5b9c9654a50727cc9ac0eaa6ff7f99dc43de 100644
--- a/core/lib/Drupal/Core/Routing/RequestContext.php
+++ b/core/lib/Drupal/Core/Routing/RequestContext.php
@@ -39,6 +39,8 @@ public function fromRequest(Request $request) {
     if (isset($GLOBALS['base_url'])) {
       $this->setCompleteBaseUrl($GLOBALS['base_url']);
     }
+
+    return $this;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Routing/UrlMatcher.php b/core/lib/Drupal/Core/Routing/UrlMatcher.php
index b6852824e143023226ba87893a6e1a655915b108..fdcdf68534a17772e853e86b6a2f66d1cd6fb6f0 100644
--- a/core/lib/Drupal/Core/Routing/UrlMatcher.php
+++ b/core/lib/Drupal/Core/Routing/UrlMatcher.php
@@ -35,9 +35,7 @@ public function __construct(CurrentPathStack $current_path) {
 
   public function finalMatch(RouteCollection $collection, Request $request) {
     $this->routes = $collection;
-    $context = new RequestContext();
-    $context->fromRequest($request);
-    $this->setContext($context);
+    $context = (new RequestContext())->fromRequest($request)->setContext($context);
 
     return $this->match($this->currentPath->getPath($request));
   }