diff --git a/core/lib/Drupal/Core/EventSubscriber/ResponseGeneratorSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ResponseGeneratorSubscriber.php
 new file mode 100644
-index 0000000..7e65366
+index 0000000..15e2f27
 --- /dev/null
 +++ b/core/lib/Drupal/Core/EventSubscriber/ResponseGeneratorSubscriber.php
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,44 @@
 +<?php
 +
 +/**
 + * @file
-+ * Contains \Drupal\Core\EventSubscriber\ResponseGeneratorSubscriber.
++ * Contains Drupal\Core\EventSubscriber\ResponseGeneratorSubscriber.
 + */
 +
 +namespace Drupal\Core\EventSubscriber;
@@ -62,22 +62,22 @@
 +    $events[KernelEvents::RESPONSE][] = ['onRespond'];
 +    return $events;
 +  }
-+
 +}
 diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
-index e5cdd87..b89a10e 100644
+index e945eca..c79a526 100644
 --- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
 +++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
-@@ -161,12 +161,8 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
+@@ -153,12 +153,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
      }
      $content = $this->renderer->render($html);

 -    // Set the generator in the HTTP header.
 -    list($version) = explode('.', \Drupal::VERSION, 2);
 -
-     $response = new CacheableResponse($content, 200,[
-       'Content-Type' => 'text/html; charset=UTF-8',
+-    $response = new CacheableResponse($content, 200,[
 -      'X-Generator' => 'Drupal ' . $version . ' (https://www.drupal.org)'
-     ]);
+-    ]);
++    $response = new CacheableResponse($content, 200);

      // Bubble the cacheability metadata associated with the rendered render
+     // arrays to the response.