diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index b20d9bb..7273244 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -46,6 +46,10 @@
  *     "id" = "cid",
  *     "bundle" = "comment_type",
  *     "label" = "subject",
+ *     "commented_entity_type" = "entity_type",
+ *     "commented_entity_id" = "entity_id",
+ *     "field_name" = "field_name",
+ *     "status" = "status",
  *     "langcode" = "langcode",
  *     "uuid" = "uuid"
  *   },
@@ -361,21 +365,21 @@ public function getParentComment() {
    * {@inheritdoc}
    */
   public function getCommentedEntity() {
-    return $this->get('entity_id')->entity;
+    return $this->entityManager()->getStorage($this->getCommentedEntityTypeId())->load($this->getCommentedEntityId());
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCommentedEntityId() {
-    return $this->get('entity_id')->target_id;
+    return $this->getEntityKey('commented_entity_id');
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCommentedEntityTypeId() {
-    return $this->get('entity_type')->value;
+    return $this->getEntityKey('commented_entity_type');
   }
 
   /**
@@ -390,7 +394,7 @@ public function setFieldName($field_name) {
    * {@inheritdoc}
    */
   public function getFieldName() {
-    return $this->get('field_name')->value;
+    return $this->getEntityKey('field_name');
   }
 
   /**
@@ -491,14 +495,14 @@ public function setCreatedTime($created) {
    * {@inheritdoc}
    */
   public function isPublished() {
-    return $this->get('status')->value == CommentInterface::PUBLISHED;
+    return $this->getEntityKey('status') == CommentInterface::PUBLISHED;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getStatus() {
-    return $this->get('status')->value;
+    return $this->getEntityKey('status');
   }
 
   /**