diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
index 6cc7718..6ae8564 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
@@ -184,7 +184,7 @@ public function testEntityFormatter() {
       </div>
 </div>
 ';
-    $expected_rendered_body_field_1 = '<div class="clearfix field field-entity-test--body field-name-body field-type-text field-label-above">
+    $expected_rendered_body_field_1 = '<div class="field field-entity-test--body field-name-body field-type-text field-label-above">
       <div class="field-label">Body</div>
     <div class="field-items">
           <div class="field-item"><p>Hello, world!</p></div>
diff --git a/core/modules/text/templates/field--text.html.twig b/core/modules/text/templates/field--text.html.twig
index 9cd1ab9..4d6d84a 100644
--- a/core/modules/text/templates/field--text.html.twig
+++ b/core/modules/text/templates/field--text.html.twig
@@ -4,17 +4,6 @@
  * @file
  * Default theme implementation for a text field.
  *
- * A 'clearfix' class is added, because 'text' fields have a 'format' property
- * that allows a Text Format to be associated with the entered text, which then
- * applies filtering on output. A common use case is to align images to the left
- * or right, and without this 'clearfix' class, such aligned images may be
- * rendered outside of the 'text' field formatter's boundaries, and hence
- * overlap with other fields. By setting the 'clearfix' class on all 'text'
- * fields, we prevent that.
- *
- * @see https://www.drupal.org/node/2358529
- *
  * @ingroup themeable
  */
 #}
-{% set attributes = attributes.addClass('clearfix') %}
diff --git a/core/modules/text/templates/field--text.html.twig b/core/themes/classy/templates/text/field--text.html.twig
similarity index 100%
copy from core/modules/text/templates/field--text.html.twig
copy to core/themes/classy/templates/text/field--text.html.twig