diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig
index a405986..a472843 100644
--- a/agaric/templates/layout/page.html.twig
+++ b/agaric/templates/layout/page.html.twig
@@ -45,11 +45,10 @@
{% block header %}
-
-
{# We've moved the header section to the content level for nodes, with an
exception for the front page. #}
{% if not node or is_front %}
+
{% block header_title %}
{% if page.header %}
{# Header hero region #}
@@ -66,6 +65,7 @@
{% endif %}
{% endblock header_title %}
+
{% endif %}
{% block tabs %}
@@ -78,7 +78,6 @@
{% endif %}
{% endblock tabs %}
-
{% endblock header %}