diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 5a9e1eb..03d0df0 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2512,12 +2512,6 @@ function drupal_common_theme() {
       'variables' => array('display' => NULL),
       'template' => 'status-messages',
     ),
-    // @TODO change this to status_messages once the messages are gone from
-    // template_preprocess_page
-    'status_messages_block' => array(
-      'variables' => array('status_headings' => array(), 'message_list' => NULL),
-      'template' => 'status-messages',
-    ),
     'links' => array(
       'variables' => array('links' => array(), 'attributes' => array('class' => array('links')), 'heading' => array(), 'set_active_class' => FALSE),
       'template' => 'links',
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 9595898..dbe2c78 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -412,7 +412,6 @@ public function rebuildThemeData() {
         'header' => 'Header',
         'footer' => 'Footer',
         'highlighted' => 'Highlighted',
-        'messages' => 'Messages',
         'help' => 'Help',
         'page_top' => 'Page top',
         'page_bottom' => 'Page bottom',
diff --git a/core/modules/system/src/Plugin/Block/SystemPageMessagesBlock.php b/core/modules/system/src/Plugin/Block/SystemPageMessagesBlock.php
deleted file mode 100644
index ad9e237..0000000
--- a/core/modules/system/src/Plugin/Block/SystemPageMessagesBlock.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Plugin\Block\SystemPageMessagesBlock.
- */
-
-namespace Drupal\system\Plugin\Block;
-
-use Drupal\block\BlockBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a block to display the page messages.
- *
- * @Block(
- *   id = "system_page_messages_block",
- *   admin_label = @Translation("Page messages")
- * )
- */
-class SystemPageMessagesBlock extends BlockBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * Stores the configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The messages.
-   * They are stored in a static property so they can appear in multiple blocks.
-   *
-   */
-  protected static $messages;
-
-  /**
-   * Creates a SystemPageMessagesBlock instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The factory for configuration objects.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return array(
-      'label_display' => FALSE,
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-
-    $build['messages'] = array(
-      // @TODO change this to status_messages once the messages are gone from
-      // template_preprocess_page
-      '#theme' => 'status_messages_block',
-      '#pre_render' => array(array($this, 'getMessages')),
-    );
-    $build['messages']['#status_headings'] = array(
-      'status' => t('Status message'),
-      'error' => t('Error message'),
-      'warning' => t('Warning message'),
-    );
-
-    return $build;
-  }
-
-  /**
-   * Gets messages in the pre-render stage.
-   *
-   * @param $element
-   * @return mixed
-   */
-  public function getMessages($element) {
-    if (!isset(static::$messages)) {
-      static::$messages = drupal_get_messages();
-    }
-    $element['#message_list'] = static::$messages;
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, array &$form_state) {
-    $form = parent::buildConfigurationForm($form, $form_state);
-
-    // @see ::isCacheable()
-    $form['cache']['#disabled'] = TRUE;
-    $form['cache']['#description'] = $this->t('This block is never cacheable, it is not configurable.');
-    $form['cache']['max_age']['#value'] = 0;
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isCacheable() {
-    // The page messages block is never cacheable, because its contents are
-    // session-specific and caching is useless.
-    return FALSE;
-  }
-
-}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 1bc35d3..02f9c06 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -180,10 +180,6 @@ function system_theme() {
       'base hook' => 'block',
       'template' => 'block--system-page-tabs-block',
     ),
-    'block__system_page_messages_block' => array(
-      'base hook' => 'block',
-      'template' => 'block--system-page-messages-block',
-    ),
     'system_themes_page' => array(
       'variables' => array(
         'theme_groups' => array(),
diff --git a/core/modules/system/templates/block--system-page-messages-block.html.twig b/core/modules/system/templates/block--system-page-messages-block.html.twig
deleted file mode 100644
index 55175d7..0000000
--- a/core/modules/system/templates/block--system-page-messages-block.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for page messages.
- *
- * Removes wrapper elements from block so that empty block does not appear when
- * there are no messages.
- *
- * Available variables:
- * - content: The content of this block.
- *
- * @ingroup themeable
- */
-#}
-{{ content }}
diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig
index c34d716..24d17fa 100644
--- a/core/modules/system/templates/install-page.html.twig
+++ b/core/modules/system/templates/install-page.html.twig
@@ -30,7 +30,6 @@
       {% if title %}
         <h1>{{ title }}</h1>
       {% endif %}
-      {{ page.messages }}
       {{ messages }}
       {{ page.content }}
     </main>
diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig
index 8f112f7..fd780d4 100644
--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@@ -41,8 +41,6 @@
       <h1>{{ title }}</h1>
     {% endif %}
 
-    {{ page.messages }}
-
     {{ messages }}
 
     {{ page.content }}
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 04972ea..d24e33c 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -32,12 +32,12 @@
  * - breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.html.twig):
- * - messages: Status and error messages. Should be displayed prominently.
  * - title_prefix: Additional output populated by modules, intended to be
  *   displayed in front of the main title tag that appears in the template.
  * - title: The page title, for use in the actual content.
  * - title_suffix: Additional output populated by modules, intended to be
  *   displayed after the main title tag that appears in the template.
+ * - messages: Status and error messages. Should be displayed prominently.
  * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
  *   view and edit tabs when displaying a node).
  * - action_links: Actions local to the page, such as "Add menu" on the menu
@@ -51,7 +51,6 @@
  * Regions:
  * - page.header: Items for the header region.
  * - page.highlighted: Items for the highlighted content region.
- * - page.messages: Status messages block can be placed in messages region.
  * - page.help: Dynamic help text, mostly for admin pages.
  * - page.content: The main content of the current page.
  * - page.sidebar_first: Items for the first sidebar.
@@ -105,8 +104,6 @@
 
   {{ breadcrumb }}
 
-  {{ page.messages }}
-
   {{ messages }}
 
   {{ page.help }}
diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml
deleted file mode 100644
index 8445b6b..0000000
--- a/core/profiles/standard/config/install/block.block.bartik_messages.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-id: bartik_messages
-theme: bartik
-weight: 0
-status: true
-langcode: en
-region: messages
-plugin: system_page_messages_block
-settings:
-  visibility: {  }
-  id: system_page_messages_block
-  label: 'Status messages'
-  provider: system
-  label_display: '0'
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
diff --git a/core/profiles/standard/config/install/block.block.seven_messages.yml b/core/profiles/standard/config/install/block.block.seven_messages.yml
deleted file mode 100644
index 5df065f..0000000
--- a/core/profiles/standard/config/install/block.block.seven_messages.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-id: seven_messages
-theme: seven
-weight: 0
-status: true
-langcode: en
-region: messages
-plugin: system_page_messages_block
-settings:
-  visibility: {  }
-  id: system_page_messages_block
-  label: 'Status messages'
-  provider: system
-  label_display: '0'
-dependencies:
-  module:
-    - system
-  theme:
-    - seven
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 4aad351..bd0bf89 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -19,7 +19,6 @@ ckeditor_stylesheets:
   - css/ckeditor-iframe.css
 regions:
   header: Header
-  messages: Messages
   help: Help
   page_top: 'Page top'
   page_bottom: 'Page bottom'
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 2589e88..5de50cc 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -34,7 +34,11 @@
         <a id="main-content"></a>
         {% if title %}<h1 class="title" id="page-title">{{ title }}</h1>{% endif %}
         {{ page.content }}
-        {{ page.messages }}
+        {% if messages %}
+          <div id="messages"><div class="section clearfix">
+            {{ messages }}
+          </div></div> <!-- /.section, /#messages -->
+        {% endif %}
       </section></main> <!-- /.section, /#content -->
     </div></div> <!-- /#main, /#main-wrapper -->
 
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 54e9c77..8c739bb 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -44,6 +44,7 @@
  * - title: The page title, for use in the actual content.
  * - title_suffix: Additional output populated by modules, intended to be
  *   displayed after the main title tag that appears in the template.
+ * - messages: Status and error messages. Should be displayed prominently.
  * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
  *   view and edit tabs when displaying a node).
  * - action_links: Actions local to the page, such as "Add menu" on the menu
@@ -56,7 +57,6 @@
  *
  * Regions:
  * - page.header: Items for the header region.
- * - page.messages: Status and error messages. Should be displayed prominently.
  * - page.featured: Items for the featured region.
  * - page.highlighted: Items for the highlighted content region.
  * - page.help: Dynamic help text, mostly for admin pages.
@@ -130,7 +130,11 @@
     {% endif %}
   </div></header> <!-- /.section, /#header-->
 
-  {{ page.messages }}
+  {% if messages %}
+    <div id="messages"><div class="section clearfix">
+      {{ messages }}
+    </div></div> <!-- /.section, /#messages -->
+  {% endif %}
 
   {% if page.featured %}
     <aside id="featured"><div class="section clearfix">
diff --git a/core/themes/bartik/templates/status-messages.html.twig b/core/themes/bartik/templates/status-messages.html.twig
deleted file mode 100644
index 87b8dcd..0000000
--- a/core/themes/bartik/templates/status-messages.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for status messages.
- *
- * Displays status, error, and warning messages, grouped by type.
- *
- * An invisible heading identifies the messages for assistive technology.
- * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
- * for info.
- *
- * Add an ARIA label to the contentinfo area so that assistive technology
- * user agents will better describe this landmark.
- *
- * Available variables:
- * - message_list: List of messages to be displayed, grouped by type.
- * - status_headings: List of all status types.
- * - display: (optional) May have a value of 'status' or 'error' when only
- *   displaying messages of that specific type.
- *
- * @see template_preprocess_status_messages()
- *
- * @ingroup themeable
- */
-#}
-{% set has_messages = 0 %}
-{% for type, messages in message_list %}
-  {% if messages|length > 0 %}
-    {% set has_messages = 1 %}
-  {% endif %}
-{% endfor %}
-
-{% if has_messages %}
-<div id="messages"><div class="section clearfix">
-{% for type, messages in message_list %}
-  <div class="messages messages--{{ type }}" role="contentinfo" aria-label="{{ status_headings[type] }}">
-    {% if type == 'error' %}
-      <div role="alert">
-    {% endif %}
-      {% if status_headings[type] %}
-        <h2 class="visually-hidden">{{ status_headings[type] }}</h2>
-      {% endif %}
-      {% if messages|length > 1 %}
-        <ul class="messages__list">
-          {% for message in messages %}
-            <li class="messages__item">{{ message }}</li>
-          {% endfor %}
-        </ul>
-      {% else %}
-        {{ messages.0 }}
-      {% endif %}
-    {% if type == 'error' %}
-      </div>
-    {% endif %}
-  </div>
-{% endfor %}
-</div></div> <!-- /.section, /#messages -->
-{% endif %}
diff --git a/core/themes/seven/templates/install-page.html.twig b/core/themes/seven/templates/install-page.html.twig
index ffbc553..98b3f8a 100644
--- a/core/themes/seven/templates/install-page.html.twig
+++ b/core/themes/seven/templates/install-page.html.twig
@@ -34,7 +34,7 @@
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
-    {{ page.messages }}
+    {{ messages }}
     {{ page.content }}
   </main>
 
diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig
index 4fdbd24..01bc89b 100644
--- a/core/themes/seven/templates/maintenance-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page.html.twig
@@ -34,7 +34,7 @@
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
-    {{ page.messages }}
+    {{ messages }}
     {{ page.content }}
   </main>
 
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index dfd4e4f..bbc804f 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -38,6 +38,7 @@
  * - title: The page title, for use in the actual content.
  * - title_suffix: Additional output populated by modules, intended to be
  *   displayed after the main title tag that appears in the template.
+ * - messages: Status and error messages. Should be displayed prominently.
  * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
  *   view and edit tabs when displaying a node).
  * - action_links: Actions local to the page, such as "Add menu" on the menu
@@ -51,7 +52,6 @@
  * Regions:
  * - page.page_top: Items for the header region.
  * - page.highlighted: Items for the highlighted content region.
- * - page.messages: Status and error messages. Should be displayed prominently.
  * - page.help: Dynamic help text, mostly for admin pages.
  * - page.content: The main content of the current page.
  * - page.sidebar_first: Items for the first sidebar.
@@ -85,7 +85,9 @@
 
     <main id="content" class="clearfix" role="main">
       <div class="visually-hidden"><a id="main-content"></a></div>
-        {{ page.messages }}
+      {% if messages %}
+        <div id="console" class="clearfix">{{ messages }}</div>
+      {% endif %}
       {% if page.help %}
         <div id="help">
           {{ page.help }}