diff --git a/core/modules/aggregator/config/schema/aggregator.views.schema.yml b/core/modules/aggregator/config/schema/aggregator.views.schema.yml
index 4bf361e..23cc642 100644
--- a/core/modules/aggregator/config/schema/aggregator.views.schema.yml
+++ b/core/modules/aggregator/config/schema/aggregator.views.schema.yml
@@ -1,13 +1,5 @@
 # Schema for the views plugins of the Aggregator module.
 
-"views.row.entity:aggregator_feed":
-  type: views_entity_row
-  label: 'Entity options'
-
-"views.row.entity:aggregator_item":
-  type: views_entity_row
-  label: 'Entity options'
-
 views.argument.aggregator_fid:
   type: views.argument.numeric
   label: 'Aggregator feed ID'
diff --git a/core/modules/comment/config/schema/comment.views.schema.yml b/core/modules/comment/config/schema/comment.views.schema.yml
index 4565e1b..51953ad 100644
--- a/core/modules/comment/config/schema/comment.views.schema.yml
+++ b/core/modules/comment/config/schema/comment.views.schema.yml
@@ -98,14 +98,6 @@ views.filter.comment_user_uid:
   type: views_filter
   label: 'Node user posted comment'
 
-"views.row.entity:comment":
-  type: views_entity_row
-  label: 'Entity options'
-  mapping:
-    links:
-      type: boolean
-      label: 'Display links'
-
 views.row.comment_rss:
   type: views_row
   label: 'Comment'
@@ -113,9 +105,6 @@ views.row.comment_rss:
     view_mode:
       type: string
       label: 'Display type'
-    links:
-      type: boolean
-      label: 'Display links'
 
 views.sort.comment_ces_last_comment_name:
   type: views_sort
diff --git a/core/modules/comment/src/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php
index 14ebb1d..fb7028a 100644
--- a/core/modules/comment/src/Plugin/views/wizard/Comment.php
+++ b/core/modules/comment/src/Plugin/views/wizard/Comment.php
@@ -75,31 +75,6 @@ protected function rowStyleOptions() {
     return $options;
   }
 
-  protected function buildFormStyle(array &$form, FormStateInterface $form_state, $type) {
-    parent::buildFormStyle($form, $form_state, $type);
-    $style_form =& $form['displays'][$type]['options']['style'];
-    // Some style plugins don't support row plugins so stop here if that's the
-    // case.
-    if (!isset($style_form['row_plugin']['#default_value'])) {
-      return;
-    }
-    $row_plugin = $style_form['row_plugin']['#default_value'];
-    switch ($row_plugin) {
-      case 'comment':
-        $style_form['row_options']['links'] = array(
-          '#type' => 'select',
-          '#title' => $this->t('Should links be displayed below each comment'),
-          '#title_display' => 'invisible',
-          '#options' => array(
-            1 => $this->t('with links (allow users to reply to the comment, etc.)'),
-            0 => $this->t('without links'),
-          ),
-          '#default_value' => 1,
-        );
-        break;
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -129,7 +104,6 @@ protected  function display_options_row(&$display_options, $row_plugin, $row_opt
     switch ($row_plugin) {
       case 'comment':
         $display_options['row']['type'] = 'entity:comment';
-        $display_options['row']['options']['links'] = !empty($row_options['links']);
         break;
     }
   }
diff --git a/core/modules/node/config/install/views.view.archive.yml b/core/modules/node/config/install/views.view.archive.yml
index 5ea021e..eb2f439 100644
--- a/core/modules/node/config/install/views.view.archive.yml
+++ b/core/modules/node/config/install/views.view.archive.yml
@@ -153,7 +153,6 @@ display:
         type: 'entity:node'
         options:
           view_mode: teaser
-          comments: false
       header: {  }
       footer: {  }
       empty: {  }
diff --git a/core/modules/node/config/install/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml
index 97637aa..4799f22 100644
--- a/core/modules/node/config/install/views.view.frontpage.yml
+++ b/core/modules/node/config/install/views.view.frontpage.yml
@@ -182,7 +182,6 @@ display:
       row:
         type: 'entity:node'
         options:
-          comments: false
           view_mode: teaser
       sorts:
         sticky:
diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml
index f8aed63..f3521e3 100644
--- a/core/modules/node/config/schema/node.views.schema.yml
+++ b/core/modules/node/config/schema/node.views.schema.yml
@@ -1,16 +1,5 @@
 # Schema for the views plugins of the Node module.
 
-"views.row.entity:node":
-  type: views_entity_row
-  label: 'Entity options'
-  mapping:
-    comments:
-      type: boolean
-      label: 'Show comments'
-    links:
-      type: boolean
-      label: 'Display links'
-
 views.area.node_listing_empty:
   type: views_area
   label: 'Node link'
@@ -234,8 +223,8 @@ views.filter_value.node_status:
   label: 'Status'
 
 views.row.node_rss:
-  type: "views.row.entity:node"
-  label: 'Content'
+  type: views_row
+  label: 'Content options'
   mapping:
     view_mode:
       type: string
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index 0f5de61..56d6dd7 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -84,42 +84,6 @@ protected function rowStyleOptions() {
   }
 
   /**
-   * Adds the style options to the wizard form.
-   *
-   * @param array $form
-   *   The full wizard form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the wizard form.
-   * @param string $type
-   *   The display ID (e.g. 'page' or 'block').
-   */
-  protected function buildFormStyle(array &$form, FormStateInterface $form_state, $type) {
-    parent::buildFormStyle($form, $form_state, $type);
-    $style_form =& $form['displays'][$type]['options']['style'];
-    // Some style plugins don't support row plugins so stop here if that's the
-    // case.
-    if (!isset($style_form['row_plugin']['#default_value'])) {
-      return;
-    }
-    $row_plugin = $style_form['row_plugin']['#default_value'];
-    switch ($row_plugin) {
-      case 'full_posts':
-      case 'teasers':
-        $style_form['row_options']['links'] = array(
-          '#type' => 'select',
-          '#title' => $this->t('Should links be displayed below each node'),
-          '#title_display' => 'invisible',
-          '#options' => array(
-            1 => $this->t('with links (allow users to add comments, etc.)'),
-            0 => $this->t('without links'),
-          ),
-          '#default_value' => 1,
-        );
-        break;
-    }
-  }
-
-  /**
    * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::defaultDisplayOptions().
    */
   protected function defaultDisplayOptions() {
@@ -213,12 +177,10 @@ protected  function display_options_row(&$display_options, $row_plugin, $row_opt
       case 'full_posts':
         $display_options['row']['type'] = 'entity:node';
         $display_options['row']['options']['view_mode'] = 'full';
-        $display_options['row']['options']['links'] = !empty($row_options['links']);
         break;
       case 'teasers':
         $display_options['row']['type'] = 'entity:node';
         $display_options['row']['options']['view_mode'] = 'teaser';
-        $display_options['row']['options']['links'] = !empty($row_options['links']);
         break;
       case 'titles_linked':
       case 'titles':
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
index c351d26..2c2995a 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml
@@ -54,7 +54,6 @@ display:
       row:
         type: 'entity:node'
         options:
-          comments: false
           view_mode: teaser
       style:
         type: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
index 856d139..8246326 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml
@@ -54,7 +54,6 @@ display:
       row:
         type: 'entity:node'
         options:
-          links: false
           view_mode: teaser
           rendering_language: translation_language_renderer
       fields:
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
index 11834f9..6292f91 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml
@@ -40,7 +40,6 @@ display:
       row:
         options:
           view_mode: teaser
-          comments: false
         type: 'entity:node'
       sorts: {  }
       style:
diff --git a/core/modules/rest/config/schema/rest.views.schema.yml b/core/modules/rest/config/schema/rest.views.schema.yml
index 3acc0a7..00a7589 100644
--- a/core/modules/rest/config/schema/rest.views.schema.yml
+++ b/core/modules/rest/config/schema/rest.views.schema.yml
@@ -4,10 +4,6 @@ views.display.rest_export:
   type: views_display_path
   label: 'REST display options'
 
-views.row.data_entity:
-  type: views_row
-  label: 'Entity row'
-
 views.row.data_field:
   type: views_row
   label: 'Field row'
diff --git a/core/modules/search/config/schema/search.views.schema.yml b/core/modules/search/config/schema/search.views.schema.yml
index b1684c6..54b5b26 100644
--- a/core/modules/search/config/schema/search.views.schema.yml
+++ b/core/modules/search/config/schema/search.views.schema.yml
@@ -24,7 +24,7 @@ views.filter.search:
       label: 'On empty input'
 
 views.row.search_view:
-  type: views.field.numeric
+  type: views_row
   label: 'Source link'
   mapping:
     score:
diff --git a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
index 51a3dde..26f32f8 100644
--- a/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
+++ b/core/modules/taxonomy/config/install/views.view.taxonomy_term.yml
@@ -215,7 +215,6 @@ display:
         type: 'entity:node'
         options:
           view_mode: teaser
-          comments: false
       header:
         entity_taxonomy_term:
           id: entity_taxonomy_term
diff --git a/core/modules/user/config/schema/user.views.schema.yml b/core/modules/user/config/schema/user.views.schema.yml
index fc8a7fd..f8ab213 100644
--- a/core/modules/user/config/schema/user.views.schema.yml
+++ b/core/modules/user/config/schema/user.views.schema.yml
@@ -60,10 +60,6 @@ views.argument_default.node:
   type: boolean
   label: 'Content ID from URL'
 
-"views.row.entity:user":
-  type: views_entity_row
-  label: 'Entity options'
-
 views_field_user:
   type: views_field
   mapping:
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index d34bd57..fafb57d 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -823,7 +823,7 @@ views_query:
 
 views_row:
   type: mapping
-  label: 'Row'
+  label: 'Row options'
   mapping:
     relationship:
       type: string
diff --git a/core/modules/views/config/schema/views.row.schema.yml b/core/modules/views/config/schema/views.row.schema.yml
index 40c62b8..5a1ca87 100644
--- a/core/modules/views/config/schema/views.row.schema.yml
+++ b/core/modules/views/config/schema/views.row.schema.yml
@@ -1,5 +1,12 @@
 # Schema for the views row.
 
+views.row.*:
+  type: views_row
+
+"views.row.entity:*":
+  type: views_entity_row
+  label: 'Entity options'
+
 views.row.fields:
   type: views_row
   label: 'Field options'
@@ -21,7 +28,7 @@ views.row.fields:
       label: 'Hide empty'
 
 views.row.rss_fields:
-  type: mapping
+  type: views_row
   label: 'RSS field options'
   mapping:
     title_field:
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
index 08ee446..b727a2a 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
@@ -44,9 +44,7 @@ display:
       row:
         type: 'entity:node'
         options:
-          links: true
           view_mode: teaser
-          comments: false
       sorts:
         created:
           field: created
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
index ffb50d5..3f1ac5d 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
@@ -58,9 +58,7 @@ display:
         type: views_query
       row:
         options:
-          links: true
           view_mode: teaser
-          comments: false
         type: 'entity:node'
       sorts:
         created:
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
index 2c9cfc0..06902bd 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml
@@ -34,7 +34,6 @@ display:
           relationship: none
           view_mode: teaser
           rendering_language: translation_language_renderer
-          links: 0
       sorts:
         title:
           id: title
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
index 8ef634a..892e10d 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
@@ -84,9 +84,6 @@ display:
         type: default
       row:
         type: 'entity:node'
-        options:
-          comments: false
-          links: '1'
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
     display_plugin: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
index bf33096..8c68841 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml
@@ -44,9 +44,6 @@ display:
         type: default
       row:
         type: 'entity:node'
-        options:
-          comments: false
-          links: '1'
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
     display_plugin: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
index 2686abd..5d87695 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml
@@ -44,9 +44,6 @@ display:
         type: default
       row:
         type: 'entity:node'
-        options:
-          comments: false
-          links: '1'
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
     display_plugin: default
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
index 8dd5551..0a730b4 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
@@ -36,9 +36,7 @@ display:
       row:
         type: 'entity:node'
         options:
-          links: true
           view_mode: teaser
-          comments: false
       fields:
         title:
           id: title
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
index e2341be..b25021e 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
@@ -50,9 +50,7 @@ display:
       row:
         type: 'entity:node'
         options:
-          links: true
           view_mode: teaser
-          comments: false
       fields:
         title:
           id: title
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
index 23dc9ea..e77805e 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
@@ -36,9 +36,7 @@ display:
       row:
         type: 'entity:node'
         options:
-          links: true
           view_mode: teaser
-          comments: false
       fields:
         title:
           id: title