diff --git a/core/modules/comment/src/CommentViewsData.php b/core/modules/comment/src/CommentViewsData.php
index 2bf8384..6784084 100644
--- a/core/modules/comment/src/CommentViewsData.php
+++ b/core/modules/comment/src/CommentViewsData.php
@@ -27,9 +27,6 @@ public function getViewsData() {
 
     $data['comment_field_data']['subject']['title'] = t('Title');
     $data['comment_field_data']['subject']['help'] = t('The title of the comment.');
-    $data['comment_field_data']['subject']['field']['id'] = 'field';
-
-    $data['comment_field_data']['cid']['field']['id'] = 'field';
 
     $data['comment_field_data']['name']['title'] = t('Author');
     $data['comment_field_data']['name']['help'] = t("The name of the comment's author. Can be rendered as a link to the author's homepage.");
diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php
index 1fbfcfd..efb67f6 100644
--- a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php
+++ b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php
@@ -104,6 +104,12 @@ function testPageCacheTags() {
       'config:system.site',
     ));
 
+    // Render the view block adds the languages cache context.
+    // As the languages is the parent of the languages::LanguageInterface::TYPE_INTERFACE
+    // cache context, it will be optimized out.
+    $cache_contexts[] = 'languages';
+    unset($cache_contexts[array_search('languages:' . LanguageInterface::TYPE_INTERFACE, $cache_contexts)]);
+
     // Full node page 2.
     $this->assertPageCacheContextsAndTags($node_2->urlInfo(), $cache_contexts, array(
       'rendered',