diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 020292e..21be46e 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -247,9 +247,6 @@ function template_preprocess_taxonomy_term(&$variables) {
   $variables['name'] = $variables['elements']['name'];
   unset($variables['elements']['name']);
   $variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term);
-
-  // Add a class for the vocabulary.
-  $variables['attributes']['class'][] = drupal_html_class('vocabulary-' . $term->bundle());
 }
 
 /**
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index a66db36..a4f7229 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -69,6 +69,7 @@
 {% endif %}
 {%
   set classes = [
+    'comment',
     'js-comment',
     status != 'published' ? status,
     comment.owner.anonymous ? 'by-anonymous',
diff --git a/core/themes/classy/templates/content/node.html.twig b/core/themes/classy/templates/content/node.html.twig
index 1e0f2d1..5af7c25 100644
--- a/core/themes/classy/templates/content/node.html.twig
+++ b/core/themes/classy/templates/content/node.html.twig
@@ -65,6 +65,7 @@
 #}
 {%
   set classes = [
+    'node',
     'node--type-' ~ node.bundle|clean_class,
     node.isPromoted() ? 'node--promoted',
     node.isSticky() ? 'node--sticky',