diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index e353501..881bc14 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1359,31 +1359,10 @@ function template_preprocess_comment(&$variables) {
       '#account' => $account_parent,
     );
     $variables['parent_author'] = drupal_render($username);
-    $variables['parent_created'] = format_date($comment_parent->getCreatedTime());
-    // Avoid calling format_date() twice on the same timestamp.
-    if ($comment_parent->getChangedTime() == $comment_parent->getCreatedTime()) {
-      $variables['parent_changed'] = $variables['parent_created'];
-    }
-    else {
-      $variables['parent_changed'] = format_date($comment_parent->getChangedTime());
-    }
-    $permalink_uri_parent = $comment_parent->permalink();
-    $attributes = $permalink_uri_parent->getOption('attributes') ?: array();
-    $attributes += array('class' => array('permalink'), 'rel' => 'bookmark');
-    $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']));
+    $variables['parent_title'] = \Drupal::linkGenerator()->generateFromUrl($comment_parent->getSubject(), $comment_parent->permalink());
   }
   else {
     $variables['parent_comment'] = '';
-    $variables['parent_author'] = '';
-    $variables['parent_created'] = '';
-    $variables['parent_changed'] = '';
-    $variables['parent_title'] = '';
-    $variables['parent_permalink'] = '';
-    $variables['parent'] = '';
   }
 
   // Helpful $content variable for templates.
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index 69adba8..afe6c30 100644
--- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -312,7 +312,8 @@ public static function baseFieldDefinitions(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 5fca73b..0618499 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -87,8 +87,8 @@
       for accessibility. The list is difficult to navigate in a screen
       reader without this information.
     #}
-    {% 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 }}</p>
     {% endif %}
 
     {{ permalink }}