diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index a82778c..5953ad8 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -80,20 +80,6 @@
   protected $createdColumn;
 
   /**
-   * A views item configuration array used for a jump-menu field.
-   *
-   * @var array
-   */
-  protected $pathField = array();
-
-  /**
-   * Additional fields required to generate the pathField.
-   *
-   * @var array
-   */
-  protected $pathFieldsSupplemental = array();
-
-  /**
    * Views items configuration arrays for filters added by the wizard.
    *
    * @var array
@@ -156,30 +142,6 @@ public function getCreatedColumn() {
   }
 
   /**
-   * Gets the pathField property.
-   *
-   * @return array
-   *   The pathField array.
-   *
-   * @todo Rename this to be something about jump menus, and/or resolve this
-   *   dependency.
-   */
-  public function getPathField() {
-    return $this->pathField;
-  }
-
-  /**
-   * Gets the pathFieldsSupplemental property.
-   *
-   * @return array()
-   *
-   * @todo Rename this to be something about jump menus, and/or remove this.
-   */
-  public function getPathFieldsSupplemental() {
-    return $this->pathFieldsSupplemental;
-  }
-
-  /**
    * Gets the filters property.
    *
    * @return array
@@ -1035,6 +997,9 @@ protected function defaultDisplaySortsUser($form, FormStateInterface $form_state
           'table' => $table,
           'field' => $column,
           'order' => $sort,
+          'entity_type' => isset($data[$column]['entity type']) ? $data[$column]['entity type'] : NULL,
+          'entity_field' => isset($data[$column]['entity field']) ? $data[$column]['entity field'] : NULL,
+          'plugin_id' => $data[$column]['sort']['id'],
        );
       }
     }