diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 20ba4a3..7ffdf83 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -585,7 +585,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
     $comment->setCreatedTime($created_time);
     $comment->changed->value = REQUEST_TIME;
     $comment->in_preview = TRUE;
-    $comment_build = comment_view($comment);
+    $comment_build = \Drupal::entityManager()->getViewBuilder('comment')->view($comment);
     $comment_build['#weight'] = -100;
 
     $preview_build['comment_preview'] = $comment_build;
@@ -595,7 +595,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
     $build = array();
     $parent = $comment->getParentComment();
     if ($parent && $parent->isPublished()) {
-      $build = comment_view($parent);
+      $build = \Drupal::entityManager()->getViewBuilder('comment')->view($parent);
     }
   }
   else {
diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php
index 85eacaa..03d8204 100644
--- a/core/modules/comment/src/Plugin/views/row/Rss.php
+++ b/core/modules/comment/src/Plugin/views/row/Rss.php
@@ -106,7 +106,7 @@ public function render($row) {
 
     // The comment gets built and modules add to or modify
     // $comment->rss_elements and $comment->rss_namespaces.
-    $build = comment_view($comment, 'rss');
+    $build = $this->entityManager->getViewBuilder('comment')->view($comment, 'rss');
     unset($build['#theme']);
 
     if (!empty($comment->rss_namespaces)) {