diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index 430d366..5df2e9d 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -20,7 +20,6 @@ use Drupal\Core\EventSubscriber\ViewSubscriber;
 use Drupal\Core\ExceptionController;
 use Drupal\Core\LegacyUrlMatcher;
 use Symfony\Component\DependencyInjection\ContainerBuilder as BaseContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
@@ -45,7 +44,8 @@ class ContainerBuilder extends BaseContainerBuilder {
     $this->register(LANGUAGE_TYPE_CONTENT, 'Drupal\\Core\\Language\\Language');
 
     // Register the HTTP kernel services.
-    $this->setDefinition('dispatcher', new Definition('Symfony\Component\EventDispatcher\EventDispatcher', array(new Reference('service_container'))))
+    $this->register('dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher')
+      ->addArgument(new Reference('service_container'))
       ->setFactoryClass('Drupal\Core\DependencyInjection\ContainerBuilder')
       ->setFactoryMethod('getKernelEventDispatcher');
     $this->register('resolver', 'Symfony\Component\HttpKernel\Controller\ControllerResolver');
@@ -57,6 +57,9 @@ class ContainerBuilder extends BaseContainerBuilder {
   /**
    * Creates an EventDispatcher for the HttpKernel. Factory method.
    *
+   * @param Drupal\Core\DependencyInjection\ContainerBuilder $container
+   *   The dependency injection container that contains the HTTP kernel.
+   *
    * @return Symfony\Component\EventDispatcher\EventDispatcher
    *   An EventDispatcher with the default listeners attached to it.
    */