diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index 8d2ac58146..c6a5bbbd41 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -361,8 +361,6 @@ class FormDisplayTemplate
             if (isset($opts['comment_warning']) && $opts['comment_warning']) {
                 $class .= ' field-comment-warning';
             }
-            $htmlOutput .= '<span class="' . $class . '" title="'
-                . htmlspecialchars($opts['comment']) . '">i</span>';
         }
         if ($isSetupScript
             && isset($opts['userprefs_comment'])
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index 428264b128..fac177fe61 100644
--- a/test/classes/Config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -217,12 +217,6 @@ class FormDisplayTemplateTest extends TestCase
             $result
         );
 
-        $this->assertStringContainsString(
-            '<span class="field-comment-mark field-comment-warning" '
-            . 'title="testComment">',
-            $result
-        );
-
         $this->assertStringContainsString(
             '<a class="restore-default hide" href="#test/path"',
             $result