diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 186a902..9471dca 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -280,12 +280,6 @@ public static function serialize(\DOMDocument $document) {
     $body_node = $document->getElementsByTagName('body')->item(0);
     $html = '';
 
-    foreach ($body_node->getElementsByTagName('script') as $node) {
-      static::escapeCdataElement($node);
-    }
-    foreach ($body_node->getElementsByTagName('style') as $node) {
-      static::escapeCdataElement($node, '/*', '*/');
-    }
     foreach ($body_node->childNodes as $node) {
       $html .= $document->saveXML($node);
     }
@@ -293,26 +287,6 @@ public static function serialize(\DOMDocument $document) {
   }
 
   /**
-   * Adds comments around a <!CDATA section in a \DOMNode.
-   *
-   * \DOMDocument::loadHTML() in \Drupal\Component\Utility\Html::load() makes
-   * CDATA sections from the contents of inline script and style tags. This can
-   * cause HTML4 browsers to throw exceptions.
-   *
-   * This function attempts to solve the problem by creating a
-   * \DOMDocumentFragment to comment the CDATA tag.
-   *
-   * @param \DOMNode $node
-   *   The element potentially containing a CDATA node.
-   * @param string $comment_start
-   *   (optional) A string to use as a comment start marker to escape the CDATA
-   *   declaration. Defaults to '//'.
-   * @param string $comment_end
-   *   (optional) A string to use as a comment end marker to escape the CDATA
-   *   declaration. Defaults to an empty string.
-   */
-
-  /**
    * Decodes all HTML entities including numerical ones to regular UTF-8 bytes.
    *
    * Double-escaped entities will only be decoded once ("&amp;lt;" becomes
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index f0c78bb..81141ae 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -66,10 +66,8 @@ public function getInfo() {
    *     tag.
    *   - #value: (optional) A string containing tag content, such as inline
    *     CSS.
-   *   - #value_prefix: (optional) A string to prepend to #value, e.g. a CDATA
-   *     wrapper prefix.
-   *   - #value_suffix: (optional) A string to append to #value, e.g. a CDATA
-   *     wrapper suffix.
+   *   - #value_prefix: (optional) A string to prepend to #value.
+   *   - #value_suffix: (optional) A string to append to #value.
    *   - #noscript: (optional) If TRUE, the markup (including any prefix or
    *     suffix) will be wrapped in a <noscript> element. (Note that passing
    *     any non-empty value here will add the <noscript> tag.)
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index efc4496..8800e76 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -121,7 +121,7 @@ function providerTestRender() {
         '#browsers' => $browsers,
       );
     };
-    $create_style_element = function($value, $media, $browsers = array(), $wrap_in_cdata = FALSE) {
+    $create_style_element = function($value, $media, $browsers = array()) {
       $style_element = array(
         '#type' => 'html_tag',
         '#tag' => 'style',
@@ -131,10 +131,6 @@ function providerTestRender() {
         ),
         '#browsers' => $browsers,
       );
-      if ($wrap_in_cdata) {
-        $style_element['#value_prefix'] = "\n/* <![CDATA[ */\n";
-        $style_element['#value_suffix'] = "\n/* ]]> */\n";
-      }
       return $style_element;
     };