diff --git a/lib/Drupal/views/Plugin/views/display/Attachment.php b/lib/Drupal/views/Plugin/views/display/Attachment.php
index 27a80f2292062fd1ad9251216eb19ab48be23aee..509d5d86a047fd727ab4c0aa0e88c560eec9d475 100644
--- a/lib/Drupal/views/Plugin/views/display/Attachment.php
+++ b/lib/Drupal/views/Plugin/views/display/Attachment.php
@@ -24,8 +24,7 @@
  *   title = @Translation("Attachment"),
  *   help = @Translation("Attachments added to other displays to achieve multiple views in the same view."),
  *   theme = "views_view",
- *   contextual_links_locations = {""},
- *   accept_attachments = FALSE
+ *   contextual_links_locations = {""}
  * )
  */
 class Attachment extends DisplayPluginBase {
@@ -195,7 +194,7 @@ function options_form(&$form, &$form_state) {
         $form['#title'] .= t('Attach to');
         $displays = array();
         foreach ($this->view->display as $display_id => $display) {
-          if (!empty($display->handler) && $display->handler->accept_attachments()) {
+          if (!empty($display->handler) && $display->handler->acceptAttachments()) {
             $displays[$display_id] = $display->display_title;
           }
         }
diff --git a/lib/Drupal/views/Plugin/views/display/Block.php b/lib/Drupal/views/Plugin/views/display/Block.php
index 252035c1bc229114b7e92494a2a6407f7f248b39..1eb9e073137236897f25f55d9f692b73c239194f 100644
--- a/lib/Drupal/views/Plugin/views/display/Block.php
+++ b/lib/Drupal/views/Plugin/views/display/Block.php
@@ -22,12 +22,18 @@
  *   theme = "views_view",
  *   uses_hook_block = TRUE,
  *   contextual_links_locations = {"block"},
- *   accept_attachments = TRUE,
  *   admin = @Translation("Block")
  * )
  */
 class Block extends DisplayPluginBase {
 
+  /**
+   * Whether the display allows attachments.
+   *
+   * @var bool
+   */
+  protected $usesAttachments = TRUE;
+
   function option_definition() {
     $options = parent::option_definition();
 
diff --git a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
index dac78f69891f5fbf0cdf7eaa2e88ff29bc754612..ea0cb403174b640d7d83db2e35f1386a6f2bdf29 100644
--- a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
+++ b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
@@ -20,12 +20,18 @@
  *   title = @Translation("Master"),
  *   help = @Translation("Default settings for this view."),
  *   theme = "views_view",
- *   no_ui = TRUE,
- *   accept_attachments = TRUE
+ *   no_ui = TRUE
  * )
  */
 class DefaultDisplay extends DisplayPluginBase {
 
+  /**
+   * Whether the display allows attachments.
+   *
+   * @var bool
+   */
+  protected $usesAttachments = TRUE;
+
   /**
    * Determine if this display is the 'default' display which contains
    * fallback settings
diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 34327c1f8235e0f138ab3542ee9f453caebed7b2..63e67cb29014a34204de6fea562d7196072c5197 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -78,6 +78,14 @@ abstract class DisplayPluginBase extends PluginBase {
    */
   protected $usesMore = TRUE;
 
+  /**
+   * Whether the display allows attachments.
+   *
+   * @var bool
+   *   TRUE if the display can use attachments, or FALSE otherwise.
+   */
+  protected $usesAttachments = FALSE;
+
   function init(&$view, &$display, $options = NULL) {
     $this->view = &$view;
     $this->display = &$display;
@@ -306,10 +314,12 @@ function use_more_text() {
   }
 
   /**
-   * Can this display accept_attachments?
+   * Determines whether this display can use attachments.
+   *
+   * @return bool
    */
-  function accept_attachments() {
-    if (empty($this->definition['accept_attachments'])) {
+  function acceptAttachments() {
+    if (!$this->usesAttachments()) {
       return FALSE;
     }
     if (!empty($this->view->argument) && $this->get_option('hide_attachment_summary')) {
@@ -322,6 +332,15 @@ function accept_attachments() {
     return TRUE;
   }
 
+  /**
+   * Returns whether the display can use attachments.
+   *
+   * @return bool
+   */
+  function usesAttachments() {
+    return $this->usesAttachments;
+  }
+
   /**
    * Allow displays to attach to other views.
    */
@@ -1144,7 +1163,7 @@ function options_summary(&$categories, &$options) {
         'desc' => t('Change whether or not this display will use AJAX.'),
       );
     }
-    if (!empty($this->definition['accept_attachments'])) {
+    if ($this->usesAttachments()) {
       $options['hide_attachment_summary'] = array(
         'category' => 'other',
         'title' => t('Hide attachments in summary'),
diff --git a/lib/Drupal/views/Plugin/views/display/Embed.php b/lib/Drupal/views/Plugin/views/display/Embed.php
index 1d6aaac70e8529fc2cb3860551ead4eeefebf76d..bb35995ab82bf6e8403e674a543d11b58905effb 100644
--- a/lib/Drupal/views/Plugin/views/display/Embed.php
+++ b/lib/Drupal/views/Plugin/views/display/Embed.php
@@ -23,8 +23,7 @@
  *   title = @Translation("Embed"),
  *   help = @Translation("Provide a display which can be embedded using the views api."),
  *   theme = "views_view",
- *   uses_hook_menu = FALSE,
- *   accept_attachments = FALSE
+ *   uses_hook_menu = FALSE
  * )
  */
 class Embed extends DisplayPluginBase {
diff --git a/lib/Drupal/views/Plugin/views/display/Feed.php b/lib/Drupal/views/Plugin/views/display/Feed.php
index 7e69205875f2b87ce7a50a315ecd4ff2ddc5143d..17c6f79a5a5a2d3ec2bad6532018d15ec2bc9d3f 100644
--- a/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -23,7 +23,6 @@
  *   title = @Translation("Feed"),
  *   help = @Translation("Display the view as a feed, such as an RSS feed."),
  *   uses_hook_menu = TRUE,
- *   accept_attachments = FALSE,
  *   admin = @Translation("Feed")
  * )
  */
@@ -197,7 +196,7 @@ function options_form(&$form, &$form_state) {
         $form['#title'] .= t('Attach to');
         $displays = array();
         foreach ($this->view->display as $display_id => $display) {
-          if (!empty($display->handler) && $display->handler->accept_attachments()) {
+          if (!empty($display->handler) && $display->handler->acceptAttachments()) {
             $displays[$display_id] = $display->display_title;
           }
         }
diff --git a/lib/Drupal/views/Plugin/views/display/Page.php b/lib/Drupal/views/Plugin/views/display/Page.php
index 7fc1c0413b34d86abdf7a7cea2418246cde3c594..316d93e7fc15bc72335a8ff62439bd0b8a5ea3f4 100644
--- a/lib/Drupal/views/Plugin/views/display/Page.php
+++ b/lib/Drupal/views/Plugin/views/display/Page.php
@@ -22,12 +22,18 @@
  *   uses_hook_menu = TRUE,
  *   contextual_links_locations = {"page"},
  *   theme = "views_view",
- *   accept_attachments = TRUE,
  *   admin = @Translation("Page")
  * )
  */
 class Page extends DisplayPluginBase {
 
+  /**
+   * Whether the display allows attachments.
+   *
+   * @var bool
+   */
+  protected $usesAttachments = TRUE;
+
   /**
    * The page display has a path.
    */
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index c344e693cb9bc3b97d888a07cfac4f380c0278dd..aad6ace885e21ea9656c595bddc6fae320d2dc6c 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -1449,7 +1449,7 @@ function attach_displays() {
       return;
     }
 
-    if (!$this->display_handler->accept_attachments()) {
+    if (!$this->display_handler->acceptAttachments()) {
       return;
     }