diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php
index 2979e89c2370d03720e2c0c451f7770ccee15427..4ce24c180f804bbf758aef3d50aae6938f3c095c 100644
--- a/core/modules/edit/lib/Drupal/edit/EditController.php
+++ b/core/modules/edit/lib/Drupal/edit/EditController.php
@@ -214,8 +214,6 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
       // The form submission saved the entity in tempstore. Return the
       // updated view of the field from the tempstore copy.
       $entity = $this->tempStoreFactory->get('edit')->get($entity->uuid());
-      // @todo Remove when http://drupal.org/node/1346214 is complete.
-      $entity = $entity->getBCEntity();
       $output = field_view_field($entity, $field_name, $view_mode_id, $langcode);
 
       $response->addCommand(new FieldFormSavedCommand(drupal_render($output)));
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
index e14e0d2d76ed11a7651ef85aced4bc1a1692675b..cdeeb0dd8e56f78298f14e4c2d44a95887902e40 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
@@ -57,9 +57,6 @@ public function build(array $form, array &$form_state, EntityInterface $entity,
    * Initialize the form state and the entity before the first form build.
    */
   protected function init(array &$form_state, EntityInterface $entity, $field_name) {
-    // @todo Remove when http://drupal.org/node/1346214 is complete.
-    $entity = $entity->getBCEntity();
-
     // @todo Rather than special-casing $node->revision, invoke prepareEdit()
     //   once http://drupal.org/node/1863258 lands.
     if ($entity->entityType() == 'node') {