diff --git a/core/core.services.yml b/core/core.services.yml
index afccb31..db7ac25 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -667,7 +667,7 @@ services:
   http_kernel:
     class: Stack\StackedHttpKernel
   http_kernel.basic:
-    class: Symfony\Component\HttpKernel\HttpKernel
+    class: Drupal\Core\StackMiddleware\HttpKernelWrapper
     arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack']
   http_middleware.negotiation:
     class: Drupal\Core\StackMiddleware\NegotiationMiddleware
diff --git a/core/lib/Drupal/Core/StackMiddleware/HttpKernelWrapper.php b/core/lib/Drupal/Core/StackMiddleware/HttpKernelWrapper.php
new file mode 100644
index 0000000..e01db54
--- /dev/null
+++ b/core/lib/Drupal/Core/StackMiddleware/HttpKernelWrapper.php
@@ -0,0 +1,237 @@
+<?php
+
+
+/**
+ * @file
+ * Contains \Drupal\Core\StackMiddleware\HttpKernelWrapper.
+ */
+namespace Drupal\Core\StackMiddleware;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Wraps HttpKernel
+ * Does not push/pull from request stack, which is done by DrupalKernel.
+ */
+class HttpKernelWrapper extends HttpKernel
+{
+
+  /**
+   * {@inheritdoc}
+   */
+  public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+  {
+    $request->headers->set('X-Php-Ob-Level', ob_get_level());
+
+    try {
+      return $this->handleRaw($request, $type);
+    } catch (\Exception $e) {
+      if (false === $catch) {
+        $this->finishRequest($request, $type);
+
+        throw $e;
+      }
+
+      return $this->handleException($e, $request, $type);
+    }
+  }
+
+  /**
+   * Handles a request to convert it to a response.
+   *
+   * Exceptions are not caught.
+   *
+   * @param Request $request A Request instance
+   * @param int     $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+   *
+   * @return Response A Response instance
+   *
+   * @throws \LogicException       If one of the listener does not behave as expected
+   * @throws NotFoundHttpException When controller cannot be found
+   */
+  private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
+  {
+    // Disabled. Request stack push is done by DrupalKernel
+    //$this->requestStack->push($request);
+
+    // request
+    $event = new GetResponseEvent($this, $request, $type);
+    $this->dispatcher->dispatch(KernelEvents::REQUEST, $event);
+
+    if ($event->hasResponse()) {
+      return $this->filterResponse($event->getResponse(), $request, $type);
+    }
+
+    // load controller
+    if (false === $controller = $this->resolver->getController($request)) {
+      throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo()));
+    }
+
+    $event = new FilterControllerEvent($this, $controller, $request, $type);
+    $this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event);
+    $controller = $event->getController();
+
+    // controller arguments
+    $arguments = $this->resolver->getArguments($request, $controller);
+
+    // call controller
+    $response = call_user_func_array($controller, $arguments);
+
+    // view
+    if (!$response instanceof Response) {
+      $event = new GetResponseForControllerResultEvent($this, $request, $type, $response);
+      $this->dispatcher->dispatch(KernelEvents::VIEW, $event);
+
+      if ($event->hasResponse()) {
+        $response = $event->getResponse();
+      }
+
+      if (!$response instanceof Response) {
+        $msg = sprintf('The controller must return a response (%s given).', $this->varToString($response));
+
+        // the user may have forgotten to return something
+        if (null === $response) {
+          $msg .= ' Did you forget to add a return statement somewhere in your controller?';
+        }
+        throw new \LogicException($msg);
+      }
+    }
+
+    return $this->filterResponse($response, $request, $type);
+  }
+
+  /**
+   * Filters a response object.
+   *
+   * @param Response $response A Response instance
+   * @param Request  $request  An error message in case the response is not a Response object
+   * @param int      $type     The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+   *
+   * @return Response The filtered Response instance
+   *
+   * @throws \RuntimeException if the passed object is not a Response instance
+   */
+  private function filterResponse(Response $response, Request $request, $type)
+  {
+    $event = new FilterResponseEvent($this, $request, $type, $response);
+
+    $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+    $this->finishRequest($request, $type);
+
+    return $event->getResponse();
+  }
+
+  /**
+   * Publishes the finish request event, then pop the request from the stack.
+   *
+   * Note that the order of the operations is important here, otherwise
+   * operations such as {@link RequestStack::getParentRequest()} can lead to
+   * weird results.
+   *
+   * @param Request $request
+   * @param int     $type
+   */
+  private function finishRequest(Request $request, $type)
+  {
+    $this->dispatcher->dispatch(KernelEvents::FINISH_REQUEST, new FinishRequestEvent($this, $request, $type));
+    // Disabled. Request stack pop is done by DrupalKernel
+    //$this->requestStack->pop();
+  }
+
+
+  /**
+   * Handles an exception by trying to convert it to a Response.
+   *
+   * @param \Exception $e       An \Exception instance
+   * @param Request    $request A Request instance
+   * @param int        $type    The type of the request
+   *
+   * @return Response A Response instance
+   *
+   * @throws \Exception
+   */
+  private function handleException(\Exception $e, $request, $type)
+  {
+    $event = new GetResponseForExceptionEvent($this, $request, $type, $e);
+    $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
+
+    // a listener might have replaced the exception
+    $e = $event->getException();
+
+    if (!$event->hasResponse()) {
+      $this->finishRequest($request, $type);
+
+      throw $e;
+    }
+
+    $response = $event->getResponse();
+
+    // the developer asked for a specific status code
+    if ($response->headers->has('X-Status-Code')) {
+      $response->setStatusCode($response->headers->get('X-Status-Code'));
+
+      $response->headers->remove('X-Status-Code');
+    } elseif (!$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
+      // ensure that we actually have an error response
+      if ($e instanceof HttpExceptionInterface) {
+        // keep the HTTP status code and headers
+        $response->setStatusCode($e->getStatusCode());
+        $response->headers->add($e->getHeaders());
+      } else {
+        $response->setStatusCode(500);
+      }
+    }
+
+    try {
+      return $this->filterResponse($response, $request, $type);
+    } catch (\Exception $e) {
+      return $response;
+    }
+  }
+
+  private function varToString($var)
+  {
+    if (is_object($var)) {
+      return sprintf('Object(%s)', get_class($var));
+    }
+
+    if (is_array($var)) {
+      $a = array();
+      foreach ($var as $k => $v) {
+        $a[] = sprintf('%s => %s', $k, $this->varToString($v));
+      }
+
+      return sprintf('Array(%s)', implode(', ', $a));
+    }
+
+    if (is_resource($var)) {
+      return sprintf('Resource(%s)', get_resource_type($var));
+    }
+
+    if (null === $var) {
+      return 'null';
+    }
+
+    if (false === $var) {
+      return 'false';
+    }
+
+    if (true === $var) {
+      return 'true';
+    }
+
+    return (string) $var;
+  }
+}