--- 2409417-55.patch	2015-03-07 10:26:31.000000000 +1100
+++ 2409417-57.patch	2015-03-07 11:44:34.000000000 +1100
@@ -150,10 +150,10 @@
 +  }
  }
 diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
-index db01ad8..d95161f 100644
+index d74fe31..c9ca97b 100644
 --- a/core/modules/views/src/ViewExecutable.php
 +++ b/core/modules/views/src/ViewExecutable.php
-@@ -1549,8 +1549,12 @@ public function attachDisplays() {
+@@ -1560,8 +1560,12 @@ public function attachDisplays() {
      $this->is_attachment = TRUE;
      // Find out which other displays attach to the current one.
      foreach ($this->display_handler->getAttachedDisplays() as $id) {
@@ -170,7 +170,7 @@
    }
 diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml
 new file mode 100644
-index 0000000..af3c1ba
+index 0000000..ecc3ef0
 --- /dev/null
 +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml
 @@ -0,0 +1,219 @@
@@ -187,7 +187,7 @@
 +module: views
 +description: ''
 +tag: ''
-+base_table: node
++base_table: node_field_data
 +base_field: nid
 +core: 8.x
 +display:
@@ -394,10 +394,10 @@
 +      display_extenders: {  }
 +      path: test-attached-disabled
 diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
-index d980f82..ffa9306 100644
+index 85b545c..59fa23a 100644
 --- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php
 +++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
-@@ -414,6 +414,10 @@ public function testAttachDisplays() {
+@@ -406,6 +406,10 @@ public function testAttachDisplays() {
        ->disableOriginalConstructor()
        ->getMock();