diff --git a/core/modules/node/config/install/views.view.content.yml b/core/modules/node/config/install/views.view.content.yml
index f01eb21..3ea06e7 100644
--- a/core/modules/node/config/install/views.view.content.yml
+++ b/core/modules/node/config/install/views.view.content.yml
@@ -321,7 +321,6 @@ display:
           hide_alter_empty: true
           link_to_node: false
           comments: false
-          optional: true
           plugin_id: history_user_timestamp
           provider: history
       filters:
@@ -473,7 +472,6 @@ display:
             identifier: langcode
             remember_roles:
               authenticated: authenticated
-          optional: true
           plugin_id: language
           provider: language
       sorts: {  }
diff --git a/core/modules/node/config/install/views.view.content_recent.yml b/core/modules/node/config/install/views.view.content_recent.yml
index 07afd74..8e231b2 100644
--- a/core/modules/node/config/install/views.view.content_recent.yml
+++ b/core/modules/node/config/install/views.view.content_recent.yml
@@ -206,7 +206,6 @@ display:
           hide_alter_empty: true
           link_to_node: false
           comments: false
-          optional: true
           plugin_id: history_user_timestamp
           provider: history
         name:
diff --git a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
index e1623f7..0800f80 100644
--- a/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
+++ b/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
@@ -21,7 +21,7 @@ public function adminLabel($short = FALSE) {
     $args = array(
       '@module' => $this->definition['original_configuration']['provider'],
     );
-    return $this->isOptional() ? t('Optional handler is missing (Module: @module) …', $args) : t('Broken/missing handler (Module: @module) …', $args);
+    return t('Broken/missing handler (Module: @module) …', $args);
   }
 
   /**
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_optional.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_optional.yml
index de319fe..2f6fe29 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_optional.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_optional.yml
@@ -10,79 +10,6 @@ display:
         pager: '0'
         pager_options: '0'
         sorts: '0'
-      fields:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      filters:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      arguments:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      sorts:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          order: ASC
-          optional: 1
-          provider: views
-      relationships:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      header:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      footer:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
-      empty:
-        id_optional:
-          field: id_optional
-          id: id_optional
-          relationship: none
-          table: views_test_data
-          plugin_id: numeric
-          optional: 1
-          provider: views
       pager:
         options:
           offset: '0'