diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php
index 2896d47..3346e0e 100644
--- a/core/modules/comment/src/CommentStorage.php
+++ b/core/modules/comment/src/CommentStorage.php
@@ -138,7 +138,6 @@ public function getSchema() {
     $schema['comment']['fields']['pid']['not null'] = TRUE;
     $schema['comment']['fields']['status']['not null'] = TRUE;
     $schema['comment']['fields']['entity_id']['not null'] = TRUE;
-    $schema['comment']['fields']['field_id']['not null'] = TRUE;
     $schema['comment']['fields']['created']['not null'] = TRUE;
     $schema['comment']['fields']['thread']['not null'] = TRUE;
 
@@ -149,7 +148,7 @@ public function getSchema() {
       'comment__num_new' => array(
         'entity_id',
         array('entity_type', 32),
-        array('field_id', 32),
+        array('comment_type', 32),
         'status',
         'created',
         'cid',
@@ -158,7 +157,7 @@ public function getSchema() {
       'comment__entity_langcode' => array(
         'entity_id',
         array('entity_type', 32),
-        array('field_id', 32),
+        array('comment_type', 32),
         'langcode',
       ),
       'comment__created' => array('created'),