diff --git a/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
index b7c0eeb..c46ace8 100644
--- a/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
@@ -8,8 +8,8 @@
 namespace Drupal\Core\Entity\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\RevisionableEntityBundleInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\entity\Entity\RevisionableEntityBundleInterface;
 
 /**
  * Extends the base entity form with revision support in the UI.
@@ -19,7 +19,7 @@ class RevisionableContentEntityForm extends ContentEntityForm {
   /**
    * The entity being used by this form.
    *
-   * @var \Drupal\Core\Entity\EntityInterface|\Drupal\Core\Entity\RevisionableInterface|\Drupal\entity\Revision\EntityRevisionLogInterface
+   * @var \Drupal\Core\Entity\EntityInterface|\Drupal\Core\Entity\RevisionableInterface|\Drupal\Core\Entity\EntityRevisionLogInterface
    */
   protected $entity;
 
@@ -28,6 +28,7 @@ class RevisionableContentEntityForm extends ContentEntityForm {
    */
   protected function prepareEntity() {
     parent::prepareEntity();
+
     $bundle_entity = $this->getBundleEntity();
     // Set up default values, if required.
     if (!$this->entity->isNew()) {
@@ -104,6 +105,7 @@ public function form(array $form, FormStateInterface $form_state) {
       '#default_value' => $this->entity->getRevisionLogMessage(),
       '#description' => $this->t('Briefly describe the changes you have made.'),
     ];
+
     return parent::form($form, $form_state);
   }
 
diff --git a/core/lib/Drupal/Core/Entity/RevisionableBundleInterface.php b/core/lib/Drupal/Core/Entity/RevisionableBundleInterface.php
deleted file mode 100644
index b100191..0000000
--- a/core/lib/Drupal/Core/Entity/RevisionableBundleInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Entity\RevisionableBundleInterface.
- */
-
-namespace Drupal\Core\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-interface RevisionableEntityBundleInterface extends ConfigEntityInterface {
-
-  /**
-   * Returns whether a new revision should be created by default.
-   *
-   * @return bool
-   *   TRUE if a new revision should be created by default.
-   */
-  public function shouldCreateNewRevision();
-
-}
diff --git a/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
new file mode 100644
index 0000000..9d7ef07
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\RevisionableEntityBundleInterface.
+ */
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+interface RevisionableEntityBundleInterface extends ConfigEntityInterface {
+
+  /**
+   * Gets whether a new revision should be created by default.
+   *
+   * @return bool
+   *   TRUE if a new revision should be created by default.
+   */
+  public function shouldCreateNewRevision();
+
+}