diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index 2ce97ca..48ef458 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -42,7 +42,8 @@ class Node extends WizardPluginBase {
     'alter' => array(
       'alter_text' => TRUE,
       'text' => 'node/[nid]'
-    )
+    ),
+    'plugin_id' => 'node',
   );
 
   /**
@@ -53,7 +54,7 @@ class Node extends WizardPluginBase {
       'value' => TRUE,
       'table' => 'node_field_data',
       'field' => 'status',
-      'provider' => 'node'
+      'plugin_id' => 'boolean'
     )
   );
 
@@ -148,6 +149,7 @@ protected function defaultDisplayOptions() {
     $display_options['fields']['title']['hide_empty'] = 0;
     $display_options['fields']['title']['empty_zero'] = 0;
     $display_options['fields']['title']['link_to_node'] = 1;
+    $display_options['fields']['title']['plugin_id'] = 'standard';
 
     return $display_options;
   }
diff --git a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
index 3297b1c..ae01ab3 100644
--- a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
+++ b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
@@ -40,7 +40,8 @@ class NodeRevision extends WizardPluginBase {
     'alter' => array(
       'alter_text' => TRUE,
       'text' => 'node/[nid]/revisions/[vid]/view'
-    )
+    ),
+    'plugin_id' => 'node_revision',
   );
 
   /**
@@ -52,7 +53,8 @@ class NodeRevision extends WizardPluginBase {
       'table' => 'node',
       'field' => 'nid',
       'exclude' => TRUE,
-      'link_to_node' => FALSE
+      'link_to_node' => FALSE,
+      'plugin_id' => 'node',
     )
   );
 
@@ -64,7 +66,7 @@ class NodeRevision extends WizardPluginBase {
       'value' => TRUE,
       'table' => 'node_field_revision',
       'field' => 'status',
-      'provider' => 'node'
+      'plugin_id' => 'boolean'
     )
   );
 
@@ -107,6 +109,7 @@ protected function defaultDisplayOptions() {
     $display_options['fields']['changed']['alter']['html'] = FALSE;
     $display_options['fields']['changed']['hide_empty'] = FALSE;
     $display_options['fields']['changed']['empty_zero'] = FALSE;
+    $display_options['fields']['changed']['plugin_id'] = 'date';
 
     /* Field: Content revision: Title */
     $display_options['fields']['title']['id'] = 'title';
@@ -125,6 +128,7 @@ protected function defaultDisplayOptions() {
     $display_options['fields']['title']['empty_zero'] = 0;
     $display_options['fields']['title']['link_to_node'] = 0;
     $display_options['fields']['title']['link_to_node_revision'] = 1;
+    $display_options['fields']['title']['plugin_id'] = 'standard';
 
     return $display_options;
   }
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 28e7afa..c906296 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -865,10 +865,6 @@ protected function defaultDisplayOptions() {
       'id' => $default_field,
     );
 
-    // Load the plugin ID and module.
-    $base_field = $data['table']['base']['field'];
-    $display_options['fields'][$base_field]['plugin_id'] = $data[$base_field]['field']['id'];
-
     return $display_options;
   }