diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig
index fcade6c..ffc39fa 100644
--- a/agaric/templates/layout/page.html.twig
+++ b/agaric/templates/layout/page.html.twig
@@ -106,15 +106,14 @@
       })
     %}
     {% endif %}
-    {% if not has_columns %}
-      {# TODO figure out how to move the removeClass here
-        without a Twig parse error:
-        set page.content_attributes = page.content_attributes|removeClass('column') #}
+    {% if has_columns %}
+      <div{{page.content_attributes }}>
     {% endif %}
     {# Main content #}
-    <div{{page.content_attributes.removeClass('column')}}>
       {{ page.content }}
-    </div>
+    {% if has_columns %}
+      </div>
+    {% endif %}
     {% endblock main_content %}
     {% block sidebar_first %}
     {# Sidebar first #}