diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
index 548ae64a492f23194be06c54230684206deb7242..52fdc082b4df4d6b79dfe6e6d3b69a39bba8eb8c 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
@@ -189,7 +189,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/text.module b/core/modules/text/text.module
index ea91ce839f3e884e5e93f24a91a07adc3a77e78d..5bcf7e28ad3bde8c626779505faa474ac9b26593 100644
--- a/core/modules/text/text.module
+++ b/core/modules/text/text.module
@@ -38,29 +38,6 @@ function text_help($route_name, RouteMatchInterface $route_match) {
   }
 }
 
-/**
- * Implements hook_theme().
- */
-function text_theme() {
-  return [
-    // Normally theme suggestion templates are only picked up when they are in
-    // themes. We explicitly define theme suggestions here so that the text
-    // field templates in core/modules/text/templates are picked up.
-    'field__text' => [
-      'render element' => 'elements',
-      'base hook' => 'field',
-    ],
-    'field__text_long' => [
-      'render element' => 'elements',
-      'base hook' => 'field',
-    ],
-    'field__text_with_summary' => [
-      'render element' => 'elements',
-      'base hook' => 'field',
-    ],
-  ];
-}
-
 /**
  * Generates a trimmed, formatted version of a text field value.
  *
diff --git a/core/modules/text/templates/field--text-long.html.twig b/core/themes/classy/templates/field/field--text-long.html.twig
similarity index 100%
rename from core/modules/text/templates/field--text-long.html.twig
rename to core/themes/classy/templates/field/field--text-long.html.twig
diff --git a/core/modules/text/templates/field--text-with-summary.html.twig b/core/themes/classy/templates/field/field--text-with-summary.html.twig
similarity index 100%
rename from core/modules/text/templates/field--text-with-summary.html.twig
rename to core/themes/classy/templates/field/field--text-with-summary.html.twig
diff --git a/core/modules/text/templates/field--text.html.twig b/core/themes/classy/templates/field/field--text.html.twig
similarity index 100%
rename from core/modules/text/templates/field--text.html.twig
rename to core/themes/classy/templates/field/field--text.html.twig