diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig
index ffc39fa..521910c 100644
--- a/agaric/templates/layout/page.html.twig
+++ b/agaric/templates/layout/page.html.twig
@@ -44,9 +44,16 @@
   {% set header_section_attributes = header_section_attributes.removeClass('is-dark').setAttribute('data-headerbg', 'light') %}
 {% endif %}
 
+{% if node %}
+  {% set header_section_attributes = header_section_attributes.removeClass('hero', 'is-dark',b'hero-main', 'is-large').removeAttribute(['data-headerbg', 'style']) %}
+{% endif %}
+
+
 {% block header %}
-{% if false %}
 <section{{ header_section_attributes }}>
+
+{# We've moved the header section to the content level for nodes #}
+{% if not node %}
   {% block header_title %}
   {% if page.header %}
   {# Header hero region #}
@@ -63,6 +70,8 @@
   </div>
   {% endif %}
   {% endblock header_title %}
+{% endif %}
+
   {% block tabs %}
   {# Drupal tabs #}
   {% if page.header_tabs %}
@@ -74,7 +83,6 @@
   {% endif %}
   {% endblock tabs %}
 </section>
-{% endif %}
 {% endblock header %}