diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 9ddfcdb..071a8f0 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
 
 /**
  * Provides a filter to limit allowed HTML tags.
@@ -95,7 +95,7 @@ public function tips($long = FALSE) {
       return $output;
     }
 
-    $output = SafeMarkup::set('<p>' . $output . '</p>');
+    $output = Xss::filter('<p>' . $output . '</p>');
     if (!$this->settings['filter_html_help']) {
       return $output;
     }
@@ -145,8 +145,8 @@ public function tips($long = FALSE) {
       if (!empty($tips[$tag])) {
         $rows[] = array(
           array('data' => $tips[$tag][0], 'class' => array('description')),
-          array('data' => SafeMarkup::set('<code>' . String::checkPlain($tips[$tag][1]) . '</code>'), 'class' => array('type')),
-          array('data' => SafeMarkup::set($tips[$tag][1]), 'class' => array('get'))
+          array('data' => Xss::filter('<code>' . String::checkPlain($tips[$tag][1]) . '</code>'), 'class' => array('type')),
+          array('data' => Xss::filter($tips[$tag][1]), 'class' => array('get'))
         );
       }
       else {
@@ -176,8 +176,8 @@ public function tips($long = FALSE) {
     foreach ($entities as $entity) {
       $rows[] = array(
         array('data' => $entity[0], 'class' => array('description')),
-        array('data' => SafeMarkup::set('<code>' . String::checkPlain($entity[1]) . '</code>'), 'class' => array('type')),
-        array('data' => SafeMarkup::set($entity[1]), 'class' => array('get'))
+        array('data' => Xss::filter('<code>' . String::checkPlain($entity[1]) . '</code>'), 'class' => array('type')),
+        array('data' => Xss::filter($entity[1]), 'class' => array('get'))
       );
     }
     $table = array(
@@ -186,7 +186,7 @@ public function tips($long = FALSE) {
       '#rows' => $rows,
     );
     $output .= drupal_render($table);
-    return SafeMarkup::set($output);
+    return Xss::filter($output);
   }
 
 }