diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 54bfefa..199b3ae 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -787,8 +787,6 @@ function template_preprocess_comment(&$variables) {
     $permalink_uri_parent->setOption('attributes', $attributes);
     $variables['parent_title'] = \Drupal::linkGenerator()->generateFromUrl($comment_parent->getSubject(), $permalink_uri_parent);
     $variables['parent_permalink'] = \Drupal::linkGenerator()->generateFromUrl(t('Parent permalink'), $permalink_uri_parent);
-    $variables['parent'] = t('In reply to !parent_title by !parent_username',
-        array('!parent_username' => $variables['parent_author'], '!parent_title' => $variables['parent_title']));
   }
   else {
     $variables['parent_comment'] = '';
@@ -797,7 +795,6 @@ function template_preprocess_comment(&$variables) {
     $variables['parent_changed'] = '';
     $variables['parent_title'] = '';
     $variables['parent_permalink'] = '';
-    $variables['parent'] = '';
   }
 
   // Helpful $content variable for templates.
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index a60bc83..f14b877 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -324,7 +324,8 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type,
    * {@inheritdoc}
    */
   public function hasParentComment() {
-    $parent = $this->get('pid')->entity;
+    // Do not load parent comment entity.
+    $parent = $this->get('pid')->target_id;
     return !empty($parent);
   }
 
diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 7ffb7c0..da94e99 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -43,21 +43,16 @@
  *
  * These variables are provided to give context about the parent comment (if
  * any):
- * - comment_parent: Full parent comment entity (if any).
+ * - parent_comment: Full parent comment entity (if any).
  * - parent_author: Equivalent to author for the parent comment.
  * - parent_created: Equivalent to created for the parent comment.
  * - parent_changed: Equivalent to changed for the parent comment.
  * - parent_title: Equivalent to title for the parent comment.
  * - parent_permalink: Equivalent to permalink for the parent comment.
- * - parent: A text string of parent comment submission information created from
- *   'parent_author' and 'parent_created' during template_preprocess_comment().
- *   This information is presented to help screen readers follow lengthy
- *   discussion threads. You can hide this from sighted users using the class
- *   visually-hidden.
  *
  * These two variables are provided for context:
  * - comment: Full comment object.
- * - entity: Entity the comments are attached to.
+ * - commented_entity: Entity the comments are attached to.
  *
  * @see template_preprocess_comment()
  *
@@ -90,9 +85,12 @@
       Indicate the semantic relationship between parent and child comments
       for accessibility. The list is difficult to navigate in a screen
       reader without this information.
+      This information is presented to help screen readers follow lengthy
+      discussion threads. You can hide this from sighted users using the class
+      visually-hidden.
     #}
-    {% if parent %}
-      <p class="parent visually-hidden">{{ parent }}</p>
+    {% if parent_comment %}
+      <p class="parent visually-hidden">{{ "In reply to !parent_title by !parent_author"|t({ '!parent_title': parent_title, '!parent_author': parent_author }) }}</p>
     {% endif %}
 
     {{ permalink }}
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index c00a9c5..d4233aa 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -43,21 +43,16 @@
  *
  * These variables are provided to give context about the parent comment (if
  * any):
- * - comment_parent: Full parent comment entity (if any).
+ * - parent_comment: Full parent comment entity (if any).
  * - parent_author: Equivalent to author for the parent comment.
  * - parent_created: Equivalent to created for the parent comment.
  * - parent_changed: Equivalent to changed for the parent comment.
  * - parent_title: Equivalent to title for the parent comment.
  * - parent_permalink: Equivalent to permalink for the parent comment.
- * - parent: A text string of parent comment submission information created from
- *   'parent_author' and 'parent_created' during template_preprocess_comment().
- *   This information is presented to help screen readers follow lengthy
- *   discussion threads. You can hide this from sighted users using the class
- *   visually-hidden.
  *
  * These two variables are provided for context:
  * - comment: Full comment object.
- * - entity: Entity the comments are attached to.
+ * - commented_entity: Entity the comments are attached to.
  *
  * @see template_preprocess_comment()
  */
@@ -79,13 +74,16 @@
           {{ permalink }}
         </p>
         {#
-          // Indicate the semantic relationship between parent and child comments
-          // for accessibility. The list is difficult to navigate in a screen
-          // reader without this information.
+          Indicate the semantic relationship between parent and child comments
+          for accessibility. The list is difficult to navigate in a screen
+          reader without this information.
+          This information is presented to help screen readers follow lengthy
+          discussion threads. You can hide this from sighted users using the class
+          visually-hidden.
         #}
-        {% if parent %}
+        {% if parent_comment %}
         <p class="comment-parent visually-hidden">
-          {{ parent }}
+          {{ "In reply to !parent_title by !parent_author"|t({ '!parent_title': parent_title, '!parent_author': parent_author }) }}
         </p>
         {% endif %}
       </div>