diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockHtmlTest.php
index 63579b9..f0051a9 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockHtmlTest.php
@@ -54,7 +54,7 @@ function testHtml() {
     $this->assertFieldByXPath('//div[@id="block-test-html-block" and @data-custom-attribute="foo"]', NULL, 'HTML ID and attributes for test block are valid and on the same DOM element.');
 
     // Ensure expected markup for a menu block.
-    $elements = $this->xpath('//div[contains(@class, :div-class)]/div/ul[contains(@class, :ul-class)]/li', array(':div-class' => 'block-system', ':ul-class' => 'menu'));
+    $elements = $this->xpath('//div[contains(@class, :div-class)]/ul[contains(@class, :ul-class)]/li', array(':div-class' => 'block-system', ':ul-class' => 'menu'));
     $this->assertTrue(!empty($elements), 'The proper block markup was found.');
   }
 
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
index 63bbf45..d736892 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
@@ -92,11 +92,8 @@ public function testBasicRendering() {
     $expected[] = '<div class="block block-block-test" id="block-test-block1">';
     $expected[] = '  ';
     $expected[] = '    ';
-    $expected[] = '';
-    $expected[] = '  <div class="content">';
-    $expected[] = '          ';
-    $expected[] = '      </div>';
-    $expected[] = '</div>';
+    $expected[] = '      ';
+    $expected[] = '  </div>';
     $expected[] = '';
     $expected_output = implode("\n", $expected);
     $this->assertEqual(drupal_render($output), $expected_output);
@@ -120,11 +117,8 @@ public function testBasicRendering() {
     $expected[] = '  ';
     $expected[] = '      <h2>Powered by Bananas</h2>';
     $expected[] = '    ';
-    $expected[] = '';
-    $expected[] = '  <div class="content">';
-    $expected[] = '          ';
-    $expected[] = '      </div>';
-    $expected[] = '</div>';
+    $expected[] = '      ';
+    $expected[] = '  </div>';
     $expected[] = '';
     $expected_output = implode("\n", $expected);
     $this->assertEqual(drupal_render($output), $expected_output);
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
index 3c51d46..d9e7805 100644
--- a/core/modules/block/templates/block.html.twig
+++ b/core/modules/block/templates/block.html.twig
@@ -39,7 +39,6 @@
  *
  * @ingroup themeable
  */
- @todo Remove the div around content as per http://drupal.org/node/1972122.
 #}
 <div{{ attributes }}>
   {{ title_prefix }}
@@ -47,10 +46,7 @@
     <h2{{ title_attributes }}>{{ label }}</h2>
   {% endif %}
   {{ title_suffix }}
-
-  <div{{ content_attributes }}>
-    {% block content %}
-      {{ content }}
-    {% endblock %}
-  </div>
+  {% block content %}
+    {{ content }}
+  {% endblock %}
 </div>
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
index b4c4616..2464502 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
@@ -78,7 +78,7 @@ protected function doTestLanguageBlockAuthenticated($block_label) {
 
     // Assert that each list item and anchor element has the appropriate data-
     // attributes.
-    list($language_switcher) = $this->xpath('//div[@id=:id]/div[contains(@class, "content")]', array(':id' => 'block-test-language-block'));
+    list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block'));    $list_items = array();
     $list_items = array();
     $anchors = array();
     foreach ($language_switcher->ul->li as $list_item) {
@@ -125,7 +125,7 @@ protected function doTestLanguageBlockAnonymous($block_label) {
     $this->assertText($block_label, 'Language switcher block found.');
 
     // Assert that only the current language is marked as active.
-    list($language_switcher) = $this->xpath('//div[@id=:id]/div[contains(@class, "content")]', array(':id' => 'block-test-language-block'));
+    list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block'));
     $links = array(
       'active' => array(),
       'inactive' => array(),
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index 3a41e77..97a4406 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -149,7 +149,7 @@ public function testExposedBlock() {
     $this->drupalGet('test_exposed_block');
 
     // Test there is an exposed form in a block.
-    $xpath = $this->buildXPathQuery('//div[@id=:id]/div/form/@id', array(':id' => drupal_html_id('block-' . $block->id())));
+    $xpath = $this->buildXPathQuery('//div[@id=:id]/form/@id', array(':id' => drupal_html_id('block-' . $block->id())));
     $this->assertFieldByXpath($xpath, $this->getExpectedExposedFormId($view), 'Expected form found in views block.');
 
     // Test there is not an exposed form in the view page content area.
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 663d60c..f08bd34 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -399,10 +399,6 @@ h1.site-name {
   overflow: hidden;
   height: 1px;
 }
-.region-header .block .content {
-  margin: 0;
-  padding: 0;
-}
 .region-header .block ul {
   margin: 0;
   padding: 0;
@@ -462,9 +458,6 @@ h1.site-name {
 .region-header #block-user-login {
   width: auto;
 }
-.region-header #block-user-login .content {
-  margin-top: 2px;
-}
 .region-header #block-user-login .form-item {
   float: left; /* LTR */
   margin: 0;
@@ -885,18 +878,21 @@ ul.links {
   padding: 15px 20px;
   margin: 0 0 20px;
 }
-.sidebar h2 {
+.sidebar .block > h2 {
   margin: 0 0 0.5em;
   border-bottom: 1px solid #d6d6d6;
   padding-bottom: 5px;
   text-shadow: 0 1px 0 #fff;
-  font-size: 1.071em;
-  line-height: 1.2;
+  font-size: 1.171em;
+  line-height: 0.857;
 }
-.sidebar .block .content {
+.sidebar .block {
   font-size: 0.914em;
   line-height: 1.4;
 }
+.sidebar .block .contextual-links {
+  font-size: 1.010;
+}
 .sidebar tbody {
   border: none;
 }
@@ -964,17 +960,12 @@ ul.links {
 
 /* ------------------ Footer ------------------ */
 
-#footer-wrapper .block .content {
-  color: #c0c0c0;
-  color: rgba(255, 255, 255, 0.65);
-  font-size: 0.857em;
-}
-#footer-wrapper .block .content a {
+#footer-wrapper .block a {
   color: #fcfcfc;
   color: rgba(255, 255, 255, 0.8);
 }
-#footer-wrapper .block .content a:hover,
-#footer-wrapper .block .content a:focus {
+#footer-wrapper .block a:hover,
+#footer-wrapper .block a:focus {
   color: #fefefe;
   color: rgba(255, 255, 255, 0.95);
   text-decoration: underline;
@@ -984,6 +975,18 @@ ul.links {
   border: 1px solid #444;
   border-color: rgba(255, 255, 255, 0.1);
   padding: 10px;
+  color: #c0c0c0;
+  color: rgba(255, 255, 255, 0.65);
+  font-size: 0.857em;
+}
+#footer-wrapper .block .contextual .contextual-links a {
+  color: #333333;
+  font-size: 1em;
+  line-height: 1;
+}
+#footer-columns .block > h2 {
+  color: #3B3B3B;
+  font-size: 1.167em;
 }
 #footer-columns .block-menu,
 #footer .block {
@@ -993,10 +996,7 @@ ul.links {
 }
 #footer .block {
   margin: 0.5em 0;
-}
-#footer .block .content {
   padding: 0.5em 0;
-  margin-top: 0;
 }
 #footer .block > h2 {
   /* @extend .visually-hidden */
@@ -1016,26 +1016,26 @@ ul.links {
   padding-bottom: 3px;
   text-transform: uppercase;
 }
-#footer-columns .content {
-  margin-top: 0;
-}
 #footer-columns p {
   margin-top: 1em;
 }
-#footer-columns .content ul {
+#footer-columns ul {
   list-style: none;
   padding-left: 0; /* LTR */
   margin-left: 0;
 }
-[dir="rtl"] #footer-columns .content ul {
+[dir="rtl"] #footer-columns ul {
   padding-right: 0;
 }
-#footer-columns .content li {
+#footer-columns li {
   list-style: none;
   margin: 0;
   padding: 0;
 }
-#footer-columns .content li a {
+#footer-columns .contextual-links li {
+  line-height: 1;
+}
+#footer-columns li a {
   display: block;
   border-bottom: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
@@ -1043,11 +1043,11 @@ ul.links {
   padding: 0.8em 2px 0.8em 20px; /* LTR */
   text-indent: -15px;
 }
-[dir="rtl"] #footer-columns .content li a {
+[dir="rtl"] #footer-columns li a {
   padding: 0.8em 20px 0.8em 2px;
 }
-#footer-columns .content li a:hover,
-#footer-columns .content li a:focus {
+#footer-columns li a:hover,
+#footer-columns li a:focus {
   background-color: #1f1f21;
   background-color: rgba(255, 255, 255, 0.05);
   text-decoration: none;