diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index ad79f6d..594c261 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1156,10 +1156,7 @@ function template_preprocess_node(&$variables) {
   $variables['page']      = $variables['view_mode'] == 'full' && node_is_page($node);
 
   // Make useful flags and node data available.
-  // @todo: The comment properties only exist if comment.module is enabled, but
-  //   are documented in node.tpl.php, so we make sure that they are set.
-  //   Consider removing them.
-  $properties = array('type', 'comment_count', 'uid', 'created', 'promote', 'sticky', 'status', 'comment');
+  $properties = array('type', 'uid', 'created', 'promote', 'sticky', 'status');
   foreach ($properties as $property) {
     $variables[$property] = isset($node->$property) ? $node->$property : NULL;
   }
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index f1e0b5a..215d31b 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -40,7 +40,6 @@
  * Other variables:
  * - node: Fully loaded node entity.
  * - type: Node type; for example, page, article, etc.
- * - comment_count: Number of comments attached to the node.
  * - uid: User ID of the node author.
  * - created: Time the node was published formatted as a Unix timestamp.
  * - zebra: Outputs either "even" or "odd". Useful for zebra striping in
@@ -54,7 +53,6 @@
  * - promote: Flag for front page promotion state.
  * - sticky: Flag for sticky post setting.
  * - status: Flag for published status.
- * - comment: State of comment settings for the node.
  * - readmore: Flag for more state. Will be true if the teaser content of the
  *   node cannot hold the main body content.
  * - is_front: Flag for front. Will be true when presented on the front page.
@@ -94,13 +92,11 @@
   {% endif %}
 
   <div class="content"{{ content_attributes }}>
-    {# We hide the comments and links now so that we can render them later. #}
-    {% hide(content.comments) %}
+    {# We hide links now so that we can render them later. #}
     {% hide(content.links) %}
     {{ content }}
   </div>
 
   {{ content.links }}
-  {{ content.comments }}
 
 </article>
diff --git a/core/modules/node/templates/node.tpl.php b/core/modules/node/templates/node.tpl.php
index 196d26f..c11b83b 100644
--- a/core/modules/node/templates/node.tpl.php
+++ b/core/modules/node/templates/node.tpl.php
@@ -43,7 +43,6 @@
  * Other variables:
  * - $node: Full node entity. Contains data that may not be safe.
  * - $type: Node type; for example, page, article, etc.
- * - $comment_count: Number of comments attached to the node.
  * - $uid: User ID of the node author.
  * - $created: Time the node was published formatted in Unix timestamp.
  * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
@@ -57,7 +56,6 @@
  * - $promote: Flag for front page promotion state.
  * - $sticky: Flags for sticky post setting.
  * - $status: Flag for published status.
- * - $comment: State of comment settings for the node.
  * - $is_front: Flags true when presented in the front page.
  * - $logged_in: Flags true when the current user is a logged-in member.
  * - $is_admin: Flags true when the current user is an administrator.
@@ -93,14 +91,12 @@
 
   <div class="content"<?php print $content_attributes; ?>>
     <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['comments']);
+      // We hide links now so that we can render them later.
       hide($content['links']);
       print render($content);
     ?>
   </div>
 
   <?php print render($content['links']); ?>
-  <?php print render($content['comments']); ?>
 
 </article>