diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 043a736..386dedd 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -470,10 +470,7 @@ public function defaultableSections($section = NULL) {
       'row' => array('style', 'row'),
 
       'pager' => array('pager', 'pager_options'),
-      'pager_options' => array('pager', 'pager_options'),
-
       'exposed_form' => array('exposed_form', 'exposed_form_options'),
-      'exposed_form_options' => array('exposed_form', 'exposed_form_options'),
 
       // These guys are special
       'header' => array('header'),
@@ -2013,7 +2010,6 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
           $plugin->submitOptionsForm($form[$plugin_type . '_options'], $form_state);
           $plugin_options['options'] = $form_state->getValue($section);
           $this->setOption($plugin_type, $plugin_options);
-          $form_state->unsetValue($section);
         }
         break;
     }