diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
index bf91854..f359119 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -256,7 +256,7 @@ public function getApplyButton(&$form, &$form_state, $section) {
 
     $form['buttons']['submit_default'] = array(
       '#type' => 'submit',
-      '#value' => t('Apply to all'),
+      '#value' => t('Apply to all displays'),
       '#dropbutton' => 'save',
       '#submit' => array(array($this, 'standardSubmitDefault')),
       '#button_type' => 'primary',
@@ -751,61 +751,11 @@ protected function getFormProgress() {
    * Sets a form progress indicator on the form.
    */
   public function getFormProgressIndicator(&$form, &$form_state, $section) {
-    $view = &$form_state['view'];
-    $display_id = $form_state['display_id'];
-    $executable = $view->get('executable');
-    $displays = $executable->displayHandlers;
-    $current_display = $executable->display_handler;
-
-    // @todo Move this to a separate function if it's needed on any forms that
-    // don't have the display dropdown.
-    $form['override'] = array(
-      '#prefix' => '<div class="views-override clearfix container-inline">',
-      '#suffix' => '</div>',
-      '#weight' => -1000,
-      '#tree' => TRUE,
-    );
-
     // Add the "2 of 3" progress indicator.
     if ($form_progress = $this->getFormProgress()) {
       $form['progress']['#markup'] = '<div id="views-progress-indicator">' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '</div>';
       $form['progress']['#weight'] = -1001;
     }
-
-    if ($current_display->isDefaultDisplay()) {
-      return;
-    }
-
-    // Determine whether any other displays have overrides for this section.
-    $section_overrides = FALSE;
-    $section_defaulted = $current_display->isDefaulted($section);
-    foreach ($displays as $id => $display) {
-      if ($id === 'default' || $id === $display_id) {
-        continue;
-      }
-      if ($display && !$display->isDefaulted($section)) {
-        $section_overrides = TRUE;
-      }
-    }
-
-    $display_dropdown['default'] = ($section_overrides ? t('All displays (except overridden)') : t('All displays'));
-    $display_dropdown[$display_id] = t('This @display_type (override)', array('@display_type' => $current_display->getPluginId()));
-    // Only display the revert option if we are in a overridden section.
-    if (!$section_defaulted) {
-      $display_dropdown['default_revert'] = t('Revert to default');
-    }
-
-    $form['override']['dropdown'] = array(
-      '#type' => 'select',
-      '#title' => t('For'), // @TODO: Translators may need more context than this.
-      '#options' => $display_dropdown,
-    );
-    if ($current_display->isDefaulted($section)) {
-      $form['override']['dropdown']['#default_value'] = 'defaults';
-    }
-    else {
-      $form['override']['dropdown']['#default_value'] = $display_id;
-    }
   }
 
   /**