.../system/templates/block--system-menu-block.html.twig       | 11 ++---------
 core/themes/bartik/css/style.css                              |  4 ++--
 .../bartik/templates/block--system-menu-block.html.twig       | 10 ++++++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/modules/system/templates/block--system-menu-block.html.twig b/core/modules/system/templates/block--system-menu-block.html.twig
index 27bb73e..dff7e39 100644
--- a/core/modules/system/templates/block--system-menu-block.html.twig
+++ b/core/modules/system/templates/block--system-menu-block.html.twig
@@ -39,7 +39,6 @@
  *
  * @ingroup themeable
  */
- @todo Remove the div around content as per http://drupal.org/node/1972122.
 #}
 {%
   set classes = [
@@ -59,14 +58,8 @@
   <h2 id="{{ heading_id }}"{{ title_attributes }}>{{ configuration.label }}</h2>
   {{ title_suffix }}
 
-  {# Menu. If no label is displayed, don't wrap it in <div class="content">. #}
-  {% if configuration.label_display %}
-    <div{{ content_attributes.addClass('content') }}>
-  {% endif %}
+  {# Menu. #}
   {% block content %}
-     {{ content }}
+    {{ content }}
   {% endblock %}
-  {% if configuration.label_display %}
-    </div>
-  {% endif %}
 </nav>
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 758a64a..9deef51 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -674,7 +674,7 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l
   display: inline-block;
   padding:  0.8em;
 }
-.region-secondary-menu .menu  a:hover,
+.region-secondary-menu .menu a:hover,
 .region-secondary-menu .menu a:focus {
   text-decoration: underline;
 }
@@ -1965,7 +1965,7 @@ div.admin-panel .description {
     overflow: visible;
   }
   [dir="rtl"] .region-primary-menu .menu li,
-  [dir="rtl"]  body:not(:target)  .region-primary-menu .menu li {
+  [dir="rtl"] body:not(:target) .region-primary-menu .menu li {
     float: right;
   }
   .region-primary-menu .menu a {
diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
index db89d82..4bbab76 100644
--- a/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -10,12 +10,18 @@
 {% set show_anchor = "show-" ~ attributes.id|clean_id %}
 {% set hide_anchor = "hide-" ~ attributes.id|clean_id %}
 {% block content %}
-  {# When rendering a menu without label, render a menu toggle. #}
-  {% if not configuration.label_display %}
+  {# If a label is displayed, wrap it in <div class="content">. #}
+  {% if configuration.label_display %}
+    <div{{ content_attributes.addClass('content') }}>
+  {% else %}
+    {# When rendering a menu without label, render a menu toggle. #}
     <div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
     <div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
     <a class="menu-toggle" href="#{{ show_anchor }}">{{ 'Menu'|t }}</a>
     <a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{{ 'Menu'|t }}</a>
   {% endif %}
   {{ content }}
+  {% if configuration.label_display %}
+    </div>
+  {% endif %}
 {% endblock %}