diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
index c0301e1..cbbac44 100644
--- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
@@ -100,28 +100,6 @@ public function getSettableOptions(AccountInterface $account = NULL) {
   /**
    * {@inheritdoc}
    */
-  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    $settings = $field_definition->getSettings();
-    $target_type = $settings['target_type'];
-
-    // Call the parent to define the target_id and entity properties.
-    $properties = parent::propertyDefinitions($field_definition);
-
-    // Only add the revision ID property if the target entity type supports
-    // revisions.
-    $target_type_info = \Drupal::entityManager()->getDefinition($target_type);
-    if ($target_type_info->hasKey('revision') && $target_type_info->getRevisionTable()) {
-      $properties['revision_id'] = DataDefinition::create('integer')
-        ->setLabel(t('Revision ID'))
-        ->setSetting('unsigned', TRUE);
-    }
-
-    return $properties;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function getConstraints() {
     $constraints = parent::getConstraints();
 
@@ -139,27 +117,6 @@ public function getConstraints() {
   /**
    * {@inheritdoc}
    */
-  public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    $schema = parent::schema($field_definition);
-
-    $target_type = $field_definition->getSetting('target_type');
-    $target_type_info = \Drupal::entityManager()->getDefinition($target_type);
-
-    if ($target_type_info->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface') && $field_definition instanceof FieldStorageConfigInterface) {
-      $schema['columns']['revision_id'] = array(
-        'description' => 'The revision ID of the target entity.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => FALSE,
-      );
-    }
-
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
     $element['target_type'] = array(
       '#type' => 'select',
diff --git a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
index 265651c..3a32d69 100644
--- a/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
+++ b/core/modules/entity_reference/src/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
@@ -57,15 +57,11 @@ protected function getEntitiesToView(FieldItemListInterface $items) {
    */
   public function prepareView(array $entities_items) {
     $target_ids = array();
-    $revision_ids = array();
 
     // Collect every possible entity attached to any of the entities.
     foreach ($entities_items as $items) {
       foreach ($items as $item) {
-        if (!empty($item->revision_id)) {
-          $revision_ids[] = $item->revision_id;
-        }
-        elseif (!empty($item->target_id)) {
+        if (!empty($item->target_id)) {
           $target_ids[] = $item->target_id;
         }
       }
@@ -79,38 +75,21 @@ public function prepareView(array $entities_items) {
       $target_entities = entity_load_multiple($target_type, $target_ids);
     }
 
-    if ($revision_ids) {
-      // We need to load the revisions one by-one.
-      foreach ($revision_ids as $revision_id) {
-        $target_entity = entity_revision_load($target_type, $revision_id);
-        // Use the revision ID in the key.
-        $identifier = $target_entity->id() . ':' . $revision_id;
-        $target_entities[$identifier] = $target_entity;
-      }
-    }
-
     // Iterate through the fieldable entities again to attach the loaded data.
     foreach ($entities_items as $items) {
       $rekey = FALSE;
       foreach ($items as $item) {
-        // If we have a revision ID, the key uses it as well.
-        $identifier = !empty($item->revision_id) ? $item->target_id . ':' . $item->revision_id : $item->target_id;
-        if ($item->target_id !== 0) {
-          if (!isset($target_entities[$identifier])) {
-            // The entity no longer exists, so empty the item.
-            $item->setValue(NULL);
-            $rekey = TRUE;
-            continue;
-          }
-        }
-        else {
-          // This is an "auto_create" item, just leave the entity in place.
+        if ($item->target_id !== 0 && !isset($target_entities[$item->target_id])) {
+          // The entity no longer exists, so empty the item.
+          $item->setValue(NULL);
+          $rekey = TRUE;
+          continue;
         }
 
-        $item->originalEntity = $target_entities[$identifier];
+        $item->originalEntity = $target_entities[$item->target_id];
       }
 
-      // Rekey the items array if needed.
+      // Re-key the items array if needed.
       if ($rekey) {
         $items->filterEmptyItems();
       }