diff --git a/core/lib/Drupal/Core/Entity/EntityBase.php b/core/lib/Drupal/Core/Entity/EntityBase.php
index 585d91779d..ff2ad97b3b 100644
--- a/core/lib/Drupal/Core/Entity/EntityBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityBase.php
@@ -675,7 +675,7 @@ public function getOriginalDefaultRevision() {
   /**
    * {@inheritdoc}
    */
-  public function setOriginalDefaultRevision(EntityInterface $original) {
+  public function setOriginalDefaultRevision(?EntityInterface $original) {
     $this->original = $original;
     return $this;
   }
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index dd77cf6a9f..fd8b4ca3b1 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -49,11 +49,6 @@ class BaseFieldOverride extends FieldConfigBase {
    */
   protected $baseFieldDefinition;
 
-  /**
-   * The original override.
-   */
-  public BaseFieldOverride $original;
-
   /**
    * Creates a base field override object.
    *
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 5cfbdd6f92..15bfb16e04 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -71,11 +71,6 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
    */
   protected $fieldStorage;
 
-  /**
-   * The original FieldConfig entity.
-   */
-  public FieldConfig $original;
-
   /**
    * Constructs a FieldConfig object.
    *
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 7a3e5a4cf7..c84352b6ef 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -229,11 +229,6 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
    */
   protected static $inDeletion = FALSE;
 
-  /**
-   * Copy of the field before changes.
-   */
-  public FieldStorageConfigInterface $original;
-
   /**
    * Constructs a FieldStorageConfig object.
    *
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 27c32ba0ab..a94c486dda 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Timer;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
@@ -1372,4 +1373,13 @@ public function getOriginalDefaultRevision() {
     return $this->storage->getOriginalDefaultRevision();
   }
 
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOriginalDefaultRevision(?EntityInterface $original) {
+    $this->storage->setOriginalDefaultRevision($original);
+    return $this;
+  }
+
 }