diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index dc6762b5252c67cf679aa3895f62a01608ffcdaf..6a6fb35ec1e5b9e4029893fafcb60a6fe8c7fe58 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -34,21 +34,6 @@
  */
 class DrupalKernel extends HttpKernel {
 
-    /**
-     * The event dispatcher used by this kernel.
-     *
-     * @var Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    protected $dispatcher;
-
-    /**
-     * The controller resolver that will extract the controller from a Request.
-     *
-     * @var Symfony\Component\HttpKernel\Controller\ControllerResolverInterface
-     */
-    protected $resolver;
-
-
     /**
      * Constructor.
      *
@@ -59,8 +44,6 @@ class DrupalKernel extends HttpKernel {
      */
    public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver) {
       parent::__construct($dispatcher, $resolver);
-      $this->dispatcher = $dispatcher;
-      $this->resolver = $resolver;
 
       $this->matcher = new UrlMatcher();
       $this->dispatcher->addSubscriber(new RouterListener($this->matcher));
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
index 5b6246df1e5682b1e3c57dfe33c090f0e18ab811..c7e13a2bffcfff0977663a0d5c5d53bb4f978e47 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RouterListener.php
@@ -12,6 +12,7 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotFoundException;
@@ -23,7 +24,22 @@
  */
 class RouterListener extends SymfonyRouterListener {
 
+  /**
+   * The Matcher object for this listener.
+   *
+   * This property is private in the base class, so we have to hack around it.
+   *
+   * @var Symfony\Component\Router\Matcher\UrlMatcherInterface
+   */
   protected $urlMatcher;
+
+  /**
+   * The Logging object for this listener.
+   *
+   * This property is private in the base class, so we have to hack around it.
+   *
+   * @var Symfony\Component\HttpKernel\Log\LoggerInterface
+   */
   protected $logger;
 
   public function __construct(UrlMatcherInterface $urlMatcher, LoggerInterface $logger = null) {