diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 40b4e40..2591b61 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -656,7 +656,7 @@ function template_preprocess_comment(&$variables) {
     $variables['permalink'] = \Drupal::l(t('Permalink'), new Url('<front>'));
   }
   else {
-    $uri = $comment->urlInfo();
+    $uri = $comment->permalink();
     $attributes = $uri->getOption('attributes') ?: array();
     $attributes += array('class' => array('permalink'), 'rel' => 'bookmark');
     $uri->setOption('attributes', $attributes);
diff --git a/core/modules/comment/src/Tests/CommentTitleTest.php b/core/modules/comment/src/Tests/CommentTitleTest.php
index dd1c97a..103845a 100644
--- a/core/modules/comment/src/Tests/CommentTitleTest.php
+++ b/core/modules/comment/src/Tests/CommentTitleTest.php
@@ -64,5 +64,9 @@ public function testCommentPopulatedTitles() {
     $this->assertTrue($this->commentExists($comment1), 'Comment #1. Comment found.');
     // Tests that markup is created for comment with heading.
     $this->assertPattern('|<h3[^>]*><a[^>]*>' . $subject_text . '</a></h3>|', 'Comment title is rendered in h3 when title populated.');
+    // Tests that the comment's title link is the permalink of the comment.
+    $comment_permalink = $this->cssSelect('.permalink');
+    $comment_permalink = (string) $comment_permalink[0]['href'];
+    $this->assertEqual($comment1->permalink()->toString(), $comment_permalink, 'The comment\'s title has the correct link');
   }
 }