diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 0549702..c45496c 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -273,12 +273,6 @@ function template_preprocess_block(&$variables) {
     $variables['label'] = $variables['elements']['content']['#title'];
   }
 
-  $variables['attributes']['class'][] = 'block';
-  $variables['attributes']['class'][] = drupal_html_class('block-' . $variables['configuration']['provider']);
-
-  // Add default class for block content.
-  $variables['content_attributes']['class'][] = 'content';
-
   // Create a valid HTML ID and make sure it is unique.
   if (!empty($variables['elements']['#id'])) {
     $variables['attributes']['id'] = drupal_html_id('block-' . $variables['elements']['#id']);
diff --git a/core/modules/block/src/Tests/BlockPreprocessUnitTest.php b/core/modules/block/src/Tests/BlockPreprocessUnitTest.php
index 9118e21..5ae036a 100644
--- a/core/modules/block/src/Tests/BlockPreprocessUnitTest.php
+++ b/core/modules/block/src/Tests/BlockPreprocessUnitTest.php
@@ -50,7 +50,7 @@ function testBlockClasses() {
     // Test adding a class to the block content.
     $variables['content_attributes']['class'][] = 'test-class';
     template_preprocess_block($variables);
-    $this->assertEqual($variables['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes');
+    $this->assertEqual($variables['content_attributes']['class'], array('test-class'), 'Test-class class added to block content_attributes');
   }
 
 }
diff --git a/core/modules/block/src/Tests/BlockViewBuilderTest.php b/core/modules/block/src/Tests/BlockViewBuilderTest.php
index 58becb0..8310550 100644
--- a/core/modules/block/src/Tests/BlockViewBuilderTest.php
+++ b/core/modules/block/src/Tests/BlockViewBuilderTest.php
@@ -82,7 +82,7 @@ public function testBasicRendering() {
     $entity = entity_load('block', 'test_block1');
     $output = entity_view($entity, 'block');
     $expected = array();
-    $expected[] = '<div class="block block-block-test" id="block-test-block1">';
+    $expected[] = '<div id="block-test-block1" class="block block-block-test">';
     $expected[] = '  ';
     $expected[] = '    ';
     $expected[] = '';
@@ -109,7 +109,7 @@ public function testBasicRendering() {
     $entity->save();
     $output = entity_view($entity, 'block');
     $expected = array();
-    $expected[] = '<div class="block block-block-test" id="block-test-block2">';
+    $expected[] = '<div id="block-test-block2" class="block block-block-test">';
     $expected[] = '  ';
     $expected[] = '      <h2>Powered by Bananas</h2>';
     $expected[] = '    ';
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
index 3c51d46..8a14d0b 100644
--- a/core/modules/block/templates/block.html.twig
+++ b/core/modules/block/templates/block.html.twig
@@ -21,13 +21,6 @@
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
- *   - class: Classes that can be used to style contextually through
- *     CSS. These can be manipulated through preprocess functions. The default
- *     values can be one or more of the following:
- *     - block: The current template type, i.e., "theming hook".
- *     - block-[module]: The module generating the block. For example, the user
- *       module is responsible for handling the default user navigation block.
- *       In that case the class would be 'block-user'.
  * - title_attributes: HTML attributes for the title element.
  * - content_attributes: HTML attributes for the content element.
  * - title_prefix: Additional output populated by modules, intended to be
@@ -41,14 +34,20 @@
  */
  @todo Remove the div around content as per http://drupal.org/node/1972122.
 #}
-<div{{ attributes }}>
+{%
+  set classes = [
+    'block',
+    'block-' ~ configuration.provider|clean_class,
+  ]
+%}
+<div{{ attributes.addClass(classes) }}>
   {{ title_prefix }}
   {% if label %}
     <h2{{ title_attributes }}>{{ label }}</h2>
   {% endif %}
   {{ title_suffix }}
 
-  <div{{ content_attributes }}>
+  <div{{ content_attributes.addClass('content') }}>
     {% block content %}
       {{ content }}
     {% endblock %}