diff --git a/core/lib/Drupal/Core/Entity/ContentEntityType.php b/core/lib/Drupal/Core/Entity/ContentEntityType.php
index c1b4e2a..519847d 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityType.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityType.php
@@ -52,20 +52,6 @@ protected function checkStorageClass($class) {
    * {@inheritdoc}
    */
   public function getRevisionMetadataKeys() {
-    // Provide backwards compatibility in case the revision metadata keys are
-    // not defined in the entity annotation.
-    if (!$this->revision_metadata_keys) {
-      $base_fields = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions($this->id());
-      if ((isset($base_fields['revision_uid']) && $revision_user = 'revision_uid') || (isset($base_fields['revision_user']) && $revision_user = 'revision_user')) {
-        $this->revision_metadata_keys['revision_user'] = $revision_user;
-      }
-      if ((isset($base_fields['revision_timestamp']) && $revision_timestamp = 'revision_timestamp') || (isset($base_fields['revision_created'])) && $revision_timestamp = 'revision_created') {
-        $this->revision_metadata_keys['revision_created'] = $revision_timestamp;
-      }
-      if ((isset($base_fields['revision_log']) && $revision_log = 'revision_log') || (isset($base_fields['revision_log_message']) && $revision_log = 'revision_log_message')) {
-        $this->revision_metadata_keys['revision_log_message'] = $revision_log;
-      }
-    }
     return $this->revision_metadata_keys;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php b/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php
index 7392858..1e77e8b 100644
--- a/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php
+++ b/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php
@@ -25,18 +25,21 @@
    * @see \Drupal\Core\Entity\FieldableEntityInterface::baseFieldDefinitions()
    */
   public static function revisionLogBaseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields['revision_created'] = BaseFieldDefinition::create('created')
+    $revision_created_key = $entity_type->getRevisionMetadataKey('revision_created') ?: 'revision_created';
+    $fields[$revision_created_key] = BaseFieldDefinition::create('created')
       ->setLabel(t('Revision create time'))
       ->setDescription(t('The time that the current revision was created.'))
       ->setRevisionable(TRUE);
 
-    $fields['revision_user'] = BaseFieldDefinition::create('entity_reference')
+    $revision_user_key = $entity_type->getRevisionMetadataKey('revision_user') ?: 'revision_user';
+    $fields[$revision_user_key] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Revision user'))
       ->setDescription(t('The user ID of the author of the current revision.'))
       ->setSetting('target_type', 'user')
       ->setRevisionable(TRUE);
 
-    $fields['revision_log_message'] = BaseFieldDefinition::create('string_long')
+    $revision_log_message_key = $entity_type->getRevisionMetadataKey('revision_log_message') ?: 'revision_log_message';
+    $fields[$revision_log_message_key] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Revision log message'))
       ->setDescription(t('Briefly describe the changes you have made.'))
       ->setRevisionable(TRUE)