diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml
index 0852a80..74465ec 100644
--- a/core/modules/node/config/schema/node.views.schema.yml
+++ b/core/modules/node/config/schema/node.views.schema.yml
@@ -4,9 +4,6 @@
   type: views_entity_row
   label: 'Entity options'
   mapping:
-    links:
-      type: boolean
-      label: 'Display links'
     comments:
       type: boolean
       label: 'Show comments'
@@ -253,6 +250,3 @@ views.row.node_rss:
     item_length:
       type: string
       label: 'Display type'
-    links:
-      type: boolean
-      label: 'Display links'
diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index 2b463f9..7da9323 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -30,10 +30,9 @@ public function buildComponents(array &$build, array $entities, array $displays,
 
     parent::buildComponents($build, $entities, $displays, $view_mode, $langcode);
 
-    foreach ($entities as $entity) {
+    foreach ($entities as $id => $entity) {
       $bundle = $entity->bundle();
       $display = $displays[$bundle];
-      $id = $entity->id();
 
       if ($display->getComponent('links')) {
         $callback = '\Drupal\node\NodeViewBuilder::renderLinks';
diff --git a/core/modules/node/src/Plugin/views/row/NodeRow.php b/core/modules/node/src/Plugin/views/row/NodeRow.php
index de71343..4f43369 100644
--- a/core/modules/node/src/Plugin/views/row/NodeRow.php
+++ b/core/modules/node/src/Plugin/views/row/NodeRow.php
@@ -34,18 +34,4 @@ protected function defineOptions() {
 
     return $options;
   }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, &$form_state) {
-    parent::buildOptionsForm($form, $form_state);
-
-    $form['links'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Display links'),
-      '#default_value' => $this->options['links'],
-    );
-  }
-
 }
diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php
index 2df6281..852c8f0 100644
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -51,11 +51,6 @@ public function buildOptionsForm(&$form, &$form_state) {
       '#options' => $this->buildOptionsForm_summary_options(),
       '#default_value' => $this->options['item_length'],
     );
-    $form['links'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Display links'),
-      '#default_value' => $this->options['links'],
-    );
   }
 
   /**