diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 7c0a458..e2c5675 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -1170,6 +1170,14 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
           ->setReadOnly(TRUE);
       }
     }
+    if ($entity_type->hasKey('status')) {
+      $fields[$entity_type->getKey('status')] = BaseFieldDefinition::create('boolean')
+        ->setLabel(new TranslatableMarkup('Publishing status'))
+        ->setDescription(t('A boolean indicating the published state.'))
+        ->setRevisionable(TRUE)
+        ->setTranslatable(TRUE)
+        ->setDefaultValue(TRUE);
+    }
 
     return $fields;
   }
diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index b4fd6aa..ab761b6 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -179,3 +179,25 @@ function comment_update_8200() {
 /**
  * @} End of "addtogroup updates-8.2.x".
  */
+
+/**
+ * @addtogroup updates-8.3.x
+ * @{
+ */
+
+function comment_update_8300() {
+  $lastInstalledSchemaRepository = \Drupal::service('entity.last_installed_schema.repository');
+  /** @var \Drupal\Core\Entity\EntityTypeInterface $last_entity_type */
+  $last_entity_type = $lastInstalledSchemaRepository->getLastInstalledDefinition('comment');
+  $keys = $last_entity_type->getKeys();
+  $keys['status'] = 'status';
+  $last_entity_type->set('entity_keys', $keys);
+  $lastInstalledSchemaRepository->setLastInstalledDefinition($last_entity_type);
+
+  $field_definitions = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('comment');
+  \Drupal::service('entity.definition_update_manager')->updateFieldStorageDefinition($field_definitions['status']);
+}
+
+/**
+ * @} End of "addtogroup updates-8.3.x".
+ */
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index 1981c0f..97cefeb 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -49,7 +49,8 @@
  *     "bundle" = "comment_type",
  *     "label" = "subject",
  *     "langcode" = "langcode",
- *     "uuid" = "uuid"
+ *     "uuid" = "uuid",
+ *     "status" = "status"
  *   },
  *   links = {
  *     "canonical" = "/comment/{comment}",
@@ -291,12 +292,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDescription(t('The time that the comment was last edited.'))
       ->setTranslatable(TRUE);
 
-    $fields['status'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the comment is published.'))
-      ->setTranslatable(TRUE)
-      ->setDefaultValue(TRUE);
-
     $fields['thread'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Thread place'))
       ->setDescription(t("The alphadecimal representation of the comment's place in a thread, consisting of a base 36 string prefixed by an integer indicating its length."))
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index bdb8050..e4c123e 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -408,13 +408,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ))
       ->setDisplayConfigurable('form', TRUE);
 
-    $fields['status'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the node is published.'))
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE)
-      ->setDefaultValue(TRUE);
-
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Authored on'))
       ->setDescription(t('The time that the node was created.'))
diff --git a/core/modules/rest/src/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php
index 3eef1a9..149c72c 100644
--- a/core/modules/rest/src/Tests/UpdateTest.php
+++ b/core/modules/rest/src/Tests/UpdateTest.php
@@ -318,7 +318,6 @@ public function testUpdateComment() {
       'homepage', // Extra compared to HAL+JSON.
       'created',
       'changed',
-      'status',
       'thread',
       'entity_type',
       'field_name',