diff --git a/core/modules/comment/comment-entity-form.js b/core/modules/comment/comment-entity-form.js
index fd16d8b..3836c0a 100644
--- a/core/modules/comment/comment-entity-form.js
+++ b/core/modules/comment/comment-entity-form.js
@@ -14,8 +14,8 @@
   Drupal.behaviors.commentFieldsetSummaries = {
     attach: function (context) {
       var $context = $(context);
-      $context.find('fieldset.comment-entity-settings-form').drupalSetSummary(function (context) {
-        return Drupal.checkPlain($(context).find('.js-form-item-comment input:checked').next('label').text());
+      $context.find('[data-drupal-selector="edit-comment-0"]').drupalSetSummary(function (context) {
+        return $context.find('[data-drupal-selector="edit-comment-0-status"] input:checked').next('label').text();
       });
     }
   };
diff --git a/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php b/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
index f7888cf..b6c66b9 100644
--- a/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
+++ b/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
@@ -76,9 +76,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         // default values for the field.
         '#open' => ($items->status != $field_default_values[0]['status']),
         '#group' => 'advanced',
-        '#attributes' => array(
-          'class' => array('comment-' . Html::getClass($entity->getEntityTypeId()) . '-settings-form'),
-        ),
         '#attached' => array(
           'library' => array('comment/drupal.comment'),
         ),