diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 18916b2c54..94a6fdc37b 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1631,9 +1631,10 @@ function template_preprocess_field_multiple_value_form(&$variables) {
     $header = [
       [
         'data' => [
-          '#prefix' => '<h4' . $header_attributes . '>',
-          '#markup' => $element['#title'],
-          '#suffix' => '</h4>',
+          '#type' => 'html_tag',
+          '#tag' => 'h4',
+          '#value' => $element['#title'],
+          '#attributes' => $header_attributes,
         ],
         'colspan' => 2,
         'class' => ['field-label'],
diff --git a/core/themes/claro/claro.theme b/core/themes/claro/claro.theme
index 35a2dbac10..7b551055e0 100644
--- a/core/themes/claro/claro.theme
+++ b/core/themes/claro/claro.theme
@@ -797,26 +797,15 @@ function claro_preprocess_field_multiple_value_form(&$variables) {
 
   if ($variables['multiple']) {
     // Add an additional CSS class for the field label table cell.
-    // This repeats the logic of template_preprocess_field_multiple_value_form()
-    // without using '#prefix' and '#suffix' for the wrapper element.
     //
     // If the field is multiple, we don't have to check the existence of the
     // table header cell.
-    //
-    // @see template_preprocess_field_multiple_value_form().
-    $header_attributes = ['class' => ['form-item__label', 'form-item__label--multiple-value-form']];
-    if (!empty($variables['element']['#required'])) {
-      $header_attributes['class'][] = 'js-form-required';
-      $header_attributes['class'][] = 'form-required';
-    }
     // Using array_key_first() for addressing the first header cell would be
     // more elegant here, but we can rely on the related theme.inc preprocess.
-    $variables['table']['#header'][0]['data'] = [
-      '#type' => 'html_tag',
-      '#tag' => 'h4',
-      '#value' => $variables['element']['#title'],
-      '#attributes' => $header_attributes,
-    ];
+    //
+    // @see template_preprocess_field_multiple_value_form().
+    $variables['table']['#header'][0]['data']['#attributes']['class'][] = 'form-item__label';
+    $variables['table']['#header'][0]['data']['#attributes']['class'][] = 'form-item__label--multiple-value-form';
 
     if ($variables['disabled']) {
       $variables['table']['#attributes']['class'][] = 'tabledrag-disabled';