diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 0336e1c..3f2b7bc 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -127,11 +127,6 @@ function comment_entity_extra_field_info() {
           'description' => t('Author textfield'),
           'weight' => -2,
         ),
-        'subject' => array(
-          'label' => t('Subject'),
-          'description' => t('Subject textfield'),
-          'weight' => -1,
-        ),
       ),
     );
   }
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 27d4a93..5d2dbe9 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -206,13 +206,13 @@ public function form(array $form, array &$form_state) {
       '#access' => $is_admin,
     );
 
-    $form['subject'] = array(
+    /*$form['subject'] = array(
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#maxlength' => 64,
       '#default_value' => $comment->getSubject(),
       '#access' => $field_definition->getSetting('subject'),
-    );
+    );*/
 
     // Used for conditional validation of author fields.
     $form['is_anonymous'] = array(
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index 1164756..cbb0e45 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -227,8 +227,17 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
 
     $fields['subject'] = FieldDefinition::create('string')
       ->setLabel(t('Subject'))
-      ->setDescription(t('The comment title or subject.'))
-      ->setSetting('max_length', 64);
+      ->setSetting('max_length', 64)
+      ->setDisplayOptions('view', array(
+        'label' => 'hidden',
+        'type' => 'string',
+        'weight' => -5,
+      ))
+      ->setDisplayOptions('form', array(
+        'type' => 'string',
+        'weight' => -5,
+      ))
+      ->setDisplayConfigurable('form', TRUE);
 
     $fields['uid'] = FieldDefinition::create('entity_reference')
       ->setLabel(t('User ID'))