diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 788070d..325fa5e 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -2103,9 +2103,8 @@ function comment_mark(Comment $comment) {
     return MARK_READ;
   }
   if (!isset($cache[$cid])) {
-    $function = $comment->entity_type . '_last_viewed';
-    if (function_exists($function)) {
-      $cache[$cid] = $function($comment->entity_id);
+    if ($comment->entity_type == 'node' && module_exists('history')) {
+      $cache[$cid] = history_read($comment->entity_id);
     }
     else {
       // @todo - decide how to handle last viewed for other entities. For now