diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index b943d17..1df644c 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -113,8 +113,7 @@ public function getOriginalId() {
    */
   public function setOriginalId($id) {
     $this->originalId = $id;
-
-    return parent::setOriginalId($id);
+    return $this;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index aba35e2..9a78c69 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -429,9 +429,7 @@ public function __sleep() {
   public function __wakeup() {
     // Run the values from self::toArray() through __construct().
     $values = array_intersect_key($this->toArray(), get_object_vars($this));
-    $is_new = $this->isNew();
     $this->__construct($values, $this->entityTypeId);
-    $this->enforceIsNew($is_new);
   }
 
 }