diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 6279199fe5fadf354dd82ea580c9ab1b574e7ffb..70ea52094e46325d9acae0b30e4a10915289d445 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -1270,20 +1270,15 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type,
    *   An array of field names.
    */
   protected function getFieldsToSkipFromTranslationChangesCheck() {
+    /** @var \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type */
+    $entity_type = $this->getEntityType();
     // A list of known revision metadata fields which should be skipped from
     // the comparision.
-    // @todo Replace the hard coded list of revision metadata fields with the
-    // solution from https://www.drupal.org/node/2615016.
     $fields = [
-      $this->getEntityType()->getKey('revision'),
+      $entity_type->getKey('revision'),
       'revision_translation_affected',
-      'revision_uid',
-      'revision_user',
-      'revision_timestamp',
-      'revision_created',
-      'revision_log',
-      'revision_log_message',
     ];
+    $fields = array_merge($fields, array_values($entity_type->getRevisionMetadataKeys()));
 
     return $fields;
   }
diff --git a/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php b/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
index 457ced842a03b7bf32a31521bfbf6ee5eea086e9..ba7e028ae09db5f84eb74a1f8f951b5be01ab8f3 100644
--- a/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
+++ b/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
@@ -26,12 +26,12 @@ public function setDatabaseDumpFiles() {
   /**
    * Tests that the revision metadata fields are moved correctly.
    */
-  public function testSystemUpdate3000() {
+  public function testSystemUpdate8400() {
     $this->runUpdates();
 
     foreach (['entity_test_revlog', 'entity_test_mul_revlog'] as $entity_type_id) {
       /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
-      $storage =  \Drupal::entityTypeManager()->getStorage($entity_type_id);
+      $storage = \Drupal::entityTypeManager()->getStorage($entity_type_id);
       /** @var \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type */
       $entity_type = $storage->getEntityType();
       $revision_metadata_field_names = $entity_type->getRevisionMetadataKeys();
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 8f53f91d77161bd82984388c9df243b46c158581..c4067ef3bbc9fd07be3195f81a4787bbecca4ac3 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1834,6 +1834,10 @@ function system_update_8301() {
     ->save();
 }
 
+/**
+ * @} End of "addtogroup updates-8.3.0".
+ */
+
 /**
  * @addtogroup updates-8.4.x
  * @{