diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
index e650389..163d98a 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
@@ -15,6 +15,36 @@
 interface CustomBlockInterface extends ContentEntityInterface {
 
   /**
+   * The block ID.
+   */
+  public function id();
+
+  /**
+   * The revision ID.
+   */
+  public function getRevisionId();
+
+  /**
+   * The block UUID.
+   */
+  public function uuid();
+
+  /**
+   * The custom block type (bundle).
+   */
+  public function bundle();
+
+  /**
+   * The block description.
+   */
+  public function getInfo();
+
+  /**
+   * The block revision log message.
+   */
+  public function getLog();
+
+  /**
    * Sets the theme value.
    *
    * When creating a new custom block from the block library, the user is
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
index 74dfc25..aa27f88 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php
@@ -51,64 +51,46 @@
 class CustomBlock extends EntityNG implements CustomBlockInterface {
 
   /**
-   * The block ID.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $id;
-
-  /**
-   * The block revision ID.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $revision_id;
-
-  /**
-   * Indicates whether this is the default block revision.
-   *
-   * The default revision of a block is the one loaded when no specific revision
-   * has been specified. Only default revisions are saved to the block_custom
-   * table.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $isDefaultRevision = TRUE;
+  public function id() {
+    return $this->get('id')->value;
+  }
 
   /**
-   * The block UUID.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $uuid;
+  public function getRevisionId() {
+    return $this->get('revision_id')->value;
+  }
 
   /**
-   * The custom block type (bundle).
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $type;
+  public function uuid() {
+    return $this->get('uuid')->value;
+  }
 
   /**
-   * The block language code.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $langcode;
+  public function bundle() {
+    return $this->get('type')->value;
+  }
 
   /**
-   * The block description.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $info;
+  public function getInfo() {
+    return $this->get('info')->value;
+  }
 
   /**
-   * The block revision log message.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
+   * {@inheritdoc}
    */
-  public $log;
+  public function getLog() {
+    return $this->get('log')->value;
+  }
 
   /**
    * The theme the block is being created in.
@@ -134,13 +116,6 @@ public function createDuplicate() {
   /**
    * {@inheritdoc}
    */
-  public function getRevisionId() {
-    return $this->revision_id->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function setTheme($theme) {
     $this->theme = $theme;
   }
@@ -153,23 +128,6 @@ public function getTheme() {
   }
 
   /**
-   * Initialize the object. Invoked upon construction and wake up.
-   */
-  protected function init() {
-    parent::init();
-    // We unset all defined properties except theme, so magic getters apply.
-    // $this->theme is a special use-case that is only used in the lifecycle of
-    // adding a new block using the block library.
-    unset($this->id);
-    unset($this->info);
-    unset($this->revision_id);
-    unset($this->log);
-    unset($this->uuid);
-    unset($this->type);
-    unset($this->new);
-  }
-
-  /**
    * {@inheritdoc}
    */
   public function uri() {
@@ -194,7 +152,7 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
    * {@inheritdoc}
    */
   public function getInstances() {
-    return entity_load_multiple_by_properties('block', array('plugin' => 'custom_block:' . $this->uuid->value));
+    return entity_load_multiple_by_properties('block', array('plugin' => 'custom_block:' . $this->uuid()));
   }
 
   /**