diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 06bb4ea..1c35081 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -124,7 +124,7 @@ function render_exposed_form($block = FALSE) {
     // Deal with any exposed filters we may have, before building.
     $form_state = array(
       'view' => &$this->view,
-      'display' => &$this->display,
+      'display' => &$this->view->display_handler->display,
       'method' => 'get',
       'rerender' => TRUE,
       'no_redirect' => TRUE,
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index f4d8404..058de63 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -911,7 +911,6 @@ function views_library_info() {
     'version' => VERSION,
     'js' => array(
       "$path/base.js" => array('group' => JS_DEFAULT),
-      "$path/ajax.js" => array('group' => JS_DEFAULT),
       "$path/ajax_view.js" => array('group' => JS_DEFAULT),
     ),
     'dependencies' => array(
diff --git a/core/modules/views/js/ajax.js b/core/modules/views/views_ui/js/ajax.js
similarity index 100%
rename from core/modules/views/js/ajax.js
rename to core/modules/views/views_ui/js/ajax.js
diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module
index e3e9362..20c13a2 100644
--- a/core/modules/views/views_ui/views_ui.module
+++ b/core/modules/views/views_ui/views_ui.module
@@ -281,6 +281,7 @@ function views_ui_library_info() {
     'title' => 'Views UI ADMIN',
     'version' => VERSION,
     'js' => array(
+      drupal_get_path('module', 'views_ui') . "/js/ajax.js" => array('group' => JS_DEFAULT),
       drupal_get_path('module', 'views_ui') . '/js/views-admin.js' => array('group' => JS_DEFAULT),
     ),
     'dependencies' => array(