diff --git a/core/core.services.yml b/core/core.services.yml
index aaed174..1aa5b84 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -833,6 +833,7 @@ services:
     arguments: ['@router.route_provider', '@path.current']
     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:
diff --git a/core/lib/Drupal/Core/Routing/DynamicRouter.php b/core/lib/Drupal/Core/Routing/DynamicRouter.php
index e38b40a..9344b83 100644
--- a/core/lib/Drupal/Core/Routing/DynamicRouter.php
+++ b/core/lib/Drupal/Core/Routing/DynamicRouter.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Path\CurrentPathStack;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface as BaseRouteEnhancerInterface;
 use Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface as BaseRouteFilterInterface;
-use Symfony\Cmf\Component\Routing\RouteProviderInterface;
+use Symfony\Cmf\Component\Routing\RouteProviderInterface as BaseRouteProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -65,7 +65,7 @@ class DynamicRouter extends UrlMatcher implements RequestMatcherInterface {
    * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
    * @param \Drupal\Core\Path\CurrentPathStack $current_path
    */
-  public function __construct(RouteProviderInterface $route_provider, CurrentPathStack $current_path) {
+  public function __construct(BaseRouteProviderInterface $route_provider, CurrentPathStack $current_path) {
     parent::__construct($current_path);
     $this->routeProvider = $route_provider;
   }