diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index fb2f320..a1a9f55 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -902,7 +902,7 @@ function comment_links(CommentInterface $comment, EntityInterface $entity, $fiel
  * Constructs render array from an array of loaded comments.
  *
  * @param $comments
- *   An array of comments as returned by comment_load_multiple().
+ *   An array of comments as returned by entity_load_multiple().
  * @param $view_mode
  *   View mode, e.g. 'full', 'teaser'...
  * @param $langcode
@@ -1135,7 +1135,7 @@ function comment_node_update_index(EntityInterface $node, $langcode) {
       $mode = $instance->getFieldSetting('default_mode');
       $comments_per_page = $instance->getFieldSetting('per_page');
       if ($node->get($field_name)->status && $cids = comment_get_thread($node, $field_name, $mode, $comments_per_page)) {
-        $comments = comment_load_multiple($cids);
+        $comments = entity_load_multiple('comment', $cids);
         comment_prepare_thread($comments);
         $build = comment_view_multiple($comments);
         $return .= drupal_render($build);
@@ -1219,6 +1219,8 @@ function comment_user_predelete($account) {
 /**
  * Loads comment entities from the database.
  *
+ * @deprecated Use entity_load_multiple('comment', $cids) instead.
+ *
  * @param array $cids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
  * @param bool $reset
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
index df6d13c..4443e4e 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
@@ -62,7 +62,7 @@ public function preRender($result) {
       $cids[] = $row->cid;
     }
 
-    $this->comments = comment_load_multiple($cids);
+    $this->comments = entity_load_multiple('comment', $cids);
     foreach ($this->comments as $comment) {
       $comment->depth = count(explode('.', $comment->thread->value)) - 1;
     }