diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
index 517ba68c09db1fee040c9212ac732cdd09b146c8..91f768bd96bd9359a5fb4d725dc708be5f3a8b5a 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
@@ -4,14 +4,14 @@
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 
 /**
  * @file
  *
- * Definition of Drupal\Core\EventSubscriber\ResponseSubscriber;
+ * Definition of Drupal\Core\EventSubscriber\RequestCloseSubscriber;
  */
 
 /**
@@ -27,10 +27,10 @@ class RequestCloseSubscriber implements EventSubscriberInterface {
    * content to drupal_page_set_cache(). There's probably a lot in here that
    * needs to get removed/changed.
    *
-   * @param FilterResponseEvent $event
+   * @param PostResponseEvent $event
    *   The Event to process.
    */
-  public function onTerminate(FilterResponseEvent $event) {
+  public function onTerminate(PostResponseEvent $event) {
 
     global $user;
     module_invoke_all('exit');
diff --git a/index.php b/index.php
index 76a34cdb511466c0253561ee2c85e4265e01f046..dfd2bba911116a034df3aea7dc74ec8c63d2b95f 100644
--- a/index.php
+++ b/index.php
@@ -32,11 +32,12 @@
 // injection container at some point.
 request($request);
 
-
 drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
 
 $dispatcher = new EventDispatcher();
 $resolver = new ControllerResolver();
 
 $kernel = new DrupalKernel($dispatcher, $resolver);
-$kernel->handle($request)->send();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);