diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index dba824f..01e5b34 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -7,13 +7,11 @@
 
 namespace Drupal\Core;
 
-use Drupal\Core\DependencyInjection\Compiler\RegisterKernelListenersPass;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Scope;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 
 /**
  * Bundle class for mandatory core services.
@@ -22,12 +20,19 @@ use Symfony\Component\DependencyInjection\Compiler\PassConfig;
  * Injection Container. Modules wishing to register services to the container
  * should extend Symfony's Bundle class directly, not this class.
  */
-class CoreBundle extends Bundle
-{
+class CoreBundle extends Bundle {
+
+  /**
+   * Implements Symfony\Component\HttpKernel\Bundle\BundleInterface::build().
+   */
   public function build(ContainerBuilder $container) {
 
-    // Add a 'request' scope for services that depend on the Request object.
+    // The 'request' scope and service enable services to depend on the Request
+    // object and get reconstructed when the request object changes (e.g.,
+    // during a subrequest).
     $container->addScope(new Scope('request'));
+    $container->register('request', 'Symfony\Component\HttpFoundation\Request')
+      ->setSynthetic(TRUE);
 
     $container->register('dispatcher', 'Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher')
       ->addArgument(new Reference('service_container'));
@@ -36,6 +41,27 @@ class CoreBundle extends Bundle
       ->addArgument(new Reference('dispatcher'))
       ->addArgument(new Reference('service_container'))
       ->addArgument(new Reference('resolver'));
+    $container->register('language_manager', 'Drupal\Core\Language\LanguageManager')
+      ->addArgument(new Reference('request'))
+      ->setScope('request');
+
+    // @todo Replace below lines with the commented out block below it when it's
+    //   performant to do so: http://drupal.org/node/1706064.
+    $dispatcher = $container->get('dispatcher');
+    $matcher = new \Drupal\Core\LegacyUrlMatcher();
+    $content_negotation = new \Drupal\Core\ContentNegotiation();
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\RouterListener($matcher));
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\ViewSubscriber($content_negotation));
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\AccessSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\PathSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\LegacyRequestSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\LegacyControllerSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\FinishResponseSubscriber());
+    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\RequestCloseSubscriber());
+    $container->set('content_negotiation', $content_negotation);
+    $dispatcher->addSubscriber(\Drupal\Core\ExceptionController::getExceptionListener($container));
+    /*
     $container->register('matcher', 'Drupal\Core\LegacyUrlMatcher');
     $container->register('router_listener', 'Drupal\Core\EventSubscriber\RouterListener')
       ->addArgument(new Reference('matcher'))
@@ -73,13 +99,9 @@ class CoreBundle extends Bundle
       ->addArgument(new Reference('service_container'))
       ->setFactoryClass('Drupal\Core\ExceptionController')
       ->setFactoryMethod('getExceptionListener');
-    $container->register('request', 'Symfony\Component\HttpFoundation\Request')
-      ->setSynthetic(TRUE);
-    $container->register('language_manager', 'Drupal\Core\Language\LanguageManager')
-      ->addArgument(new Reference('request'))
-      ->setScope('request');
 
     // Add a compiler pass for registering event subscribers.
     $container->addCompilerPass(new RegisterKernelListenersPass(), PassConfig::TYPE_AFTER_REMOVING);
+    */
   }
 }
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
deleted file mode 100644
index 0bc4d67..0000000
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\DependencyInjection\Container.
- */
-
-namespace Drupal\Core\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder as BaseContainerBuilder;
-use Symfony\Component\DependencyInjection\Container;
-
-/**
- * Drupal's dependency injection container builder.
- *
- * @todo Submit upstream patches to Symfony to not require these overrides.
- */
-class ContainerBuilder extends BaseContainerBuilder {
-
-  /**
-   * Overrides Symfony\Component\DependencyInjection\ContainerBuilder::addObjectResource().
-   *
-   * Drupal does not use Symfony's Config component, so we override
-   * addObjectResource() with an empty implementation to prevent errors during
-   * container compilation.
-   */
-  public function addObjectResource($object) {
-  }
-
-  /**
-   * Overrides Symfony\Component\DependencyInjection\ContainerBuilder::set().
-   *
-   * Drupal's container builder can be used at runtime after compilation, so we
-   * override Symfony's ContainerBuilder's restriction on setting services in a
-   * frozen builder.
-   *
-   * @todo Restrict this to synthetic services only. Ideally, the upstream
-   *   ContainerBuilder class should be fixed to allow setting synthetic
-   *   services in a frozen builder.
-   */
-  public function set($id, $service, $scope = self::SCOPE_CONTAINER) {
-    Container::set($id, $service, $scope);
-  }
-
-}
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 6737310..1bce348 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -9,42 +9,59 @@ namespace Drupal\Core;
 
 use Drupal\Core\CoreBundle;
 use Symfony\Component\HttpKernel\Kernel;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * The DrupalKernel class is the core of Drupal itself.
  */
 class DrupalKernel extends Kernel {
 
+  /**
+   * Implements Symfony\Component\HttpKernel\KernelInterface::registerContainerConfiguration().
+   *
+   * This method is required by KernelInterface, but is not used by Drupal.
+   */
+  function registerContainerConfiguration(LoaderInterface $loader) {
+  }
+
+  /**
+   * Implements Symfony\Component\HttpKernel\KernelInterface::registerBundles().
+   *
+   * @return array An array of
+   *   Symfony\Component\HttpKernel\Bundle\BundleInterface objects.
+   */
   public function registerBundles() {
     $bundles = array(
       new CoreBundle(),
     );
 
-    // TODO: Remove the necessity of calling system_list() to find out which
-    // bundles exist. See http://drupal.org/node/1331486
+    // @todo Remove the necessity of calling system_list() to find out which
+    //   bundles exist. See http://drupal.org/node/1331486.
     $modules = array_keys(system_list('module_enabled'));
     foreach ($modules as $module) {
       $camelized = ContainerBuilder::camelize($module);
-      $class = "\Drupal\\{$module}\\{$camelized}Bundle";
-      if (class_exists($class)) {
+      $class = "Drupal\\{$module}\\{$camelized}Bundle";
+      // @todo FALSE is passed so as not to incur autoloader overhead for
+      //   modules without a bundle class. However, this requires the module
+      //   to require_once its bundle class. Remove this requirement when it's
+      //   possible to do so performantly.
+      if (class_exists($class, FALSE)) {
         $bundles[] = new $class();
       }
     }
     return $bundles;
   }
 
-
   /**
    * Initializes the service container.
    */
   protected function initializeContainer() {
-    // @todo We should be compiling the container and dumping to php so we don't
-    // have to recompile every time. There is a separate issue for this, see
-    // http://drupal.org/node/1668892.
+    // @todo Building the container is slow when there's a lot of entries, so
+    //   dump it to disk and retrieve from there on subsequent requests:
+    //   http://drupal.org/node/1706064.
     $this->container = $this->buildContainer();
+
     $this->container->set('kernel', $this);
     drupal_container($this->container);
   }
@@ -52,7 +69,7 @@ class DrupalKernel extends Kernel {
   /**
    * Builds the service container.
    *
-   * @return ContainerBuilder The compiled service container
+   * @return ContainerBuilder The fully built service container.
    */
   protected function buildContainer() {
     $container = $this->getContainerBuilder();
@@ -64,29 +81,11 @@ class DrupalKernel extends Kernel {
     foreach ($this->bundles as $bundle) {
       $bundle->build($container);
     }
-    $container->compile();
-    return $container;
-  }
 
-  /**
-   * Gets a new ContainerBuilder instance used to build the service container.
-   *
-   * @return ContainerBuilder
-   */
-  protected function getContainerBuilder() {
-    return new ContainerBuilder(new ParameterBag($this->getKernelParameters()));
-  }
+    // @todo Compile the container: http://drupal.org/node/1706064.
+    //$container->compile();
 
-  /**
-   * Overrides and eliminates this method from the parent class. Do not use.
-   *
-   * This method is part of the KernelInterface interface, but takes an object
-   * implementing LoaderInterface as its only parameter. This is part of the
-   * Config compoment from Symfony, which is not provided by Drupal core.
-   *
-   * Modules wishing to provide an extension to this class which uses this
-   * method are responsible for ensuring the Config component exists.
-   */
-  public function registerContainerConfiguration(LoaderInterface $loader) {
+    return $container;
   }
+
 }
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 3c3126d..d989e69 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\EventSubscriber;
 
-use Drupal\Core\Language\LanguageManager;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -17,12 +16,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class FinishResponseSubscriber implements EventSubscriberInterface {
 
-  protected $language_manager;
-
-  public function __construct(LanguageManager $language_manager) {
-    $this->language_manager = $language_manager;
-  }
-
   /**
    * Sets extra headers on successful responses.
    *
@@ -37,7 +30,10 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
     $response->headers->set('X-UA-Compatible', 'IE=edge,chrome=1', false);
 
     // Set the Content-language header.
-    $response->headers->set('Content-language', $this->language_manager->getLanguage(LANGUAGE_TYPE_INTERFACE)->langcode);
+    // @todo Receive the LanguageManager object as a constructor argument when
+    //   the dependency injection container allows for it performantly:
+    //   http://drupal.org/node/1706064.
+    $response->headers->set('Content-language', language_manager(LANGUAGE_TYPE_INTERFACE)->langcode);
 
     // Because pages are highly dynamic, set the last-modified time to now
     // since the page is in fact being regenerated right now.
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
index bd940d3..c3040d7 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\language\Tests;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/system/tests/modules/bundle_test/bundle_test.module b/core/modules/system/tests/modules/bundle_test/bundle_test.module
index 5f30b8f..b1f443c 100644
--- a/core/modules/system/tests/modules/bundle_test/bundle_test.module
+++ b/core/modules/system/tests/modules/bundle_test/bundle_test.module
@@ -1,5 +1,8 @@
 <?php
 
+// @see Drupal\Core\DrupalKernel::registerBundles().
+require_once __DIR__ . '/lib/Drupal/bundle_test/BundleTestBundle.php';
+
 /**
  * Implements hook_menu().
  */
diff --git a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
index c124007..2a0c87e 100644
--- a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
+++ b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
@@ -15,10 +15,13 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 /**
  * Test bundle class.
  */
-class BundleTestBundle extends Bundle
-{
+class BundleTestBundle extends Bundle {
   public function build(ContainerBuilder $container) {
     $container->register('bundle_test_class', 'Drupal\bundle_test\TestClass')
       ->addTag('kernel.event_subscriber');
+
+    // @todo Remove when the 'kernel.event_subscriber' tag above is made to
+    //   work: http://drupal.org/node/1706064.
+    $container->get('dispatcher')->addSubscriber($container->get('bundle_test_class'));
   }
 }