diff --git a/sites/all/modules/contrib/inline_entity_form/includes/entity.inline_entity_form.inc b/sites/all/modules/contrib/inline_entity_form/includes/entity.inline_entity_form.inc
index 322cd74..b419432 100644
--- a/sites/all/modules/contrib/inline_entity_form/includes/entity.inline_entity_form.inc
+++ b/sites/all/modules/contrib/inline_entity_form/includes/entity.inline_entity_form.inc
@@ -236,36 +236,6 @@ class EntityInlineEntityFormController {
 
     if ($info['fieldable']) {
       field_attach_submit($this->entityType, $entity, $entity_form, $form_state);
-      $this->cleanupFieldFormState($entity_form, $form_state);
-    }
-  }
-
-  /**
-   * Cleans up the form state for each field.
-   *
-   * After field_attach_submit() has run and the entity has been saved, the form
-   * state still contains field data in $form_state['field']. Unless that
-   * data is removed, the next form with the same #parents (reopened add form,
-   * for example) will contain data (i.e. uploaded files) from the previous form.
-   *
-   * @param $entity_form
-   *   The entity form.
-   * @param $form_state
-   *   The form state of the parent form.
-   */
-  protected function cleanupFieldFormState($entity_form, &$form_state) {
-    list(, , $bundle) = entity_extract_ids($entity_form['#entity_type'], $entity_form['#entity']);
-    $instances = field_info_instances($entity_form['#entity_type'], $bundle);
-    foreach ($instances as $instance) {
-      $field_name = $instance['field_name'];
-      $parents = $entity_form[$field_name]['#parents'];
-      array_pop($parents);
-      $langcode = $entity_form[$field_name]['#language'];
-
-      $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state);
-      unset($field_state['items']);
-      $field_state['items_count'] = 0;
-      field_form_set_state($parents, $field_name, $langcode, $form_state, $field_state);
     }
   }
 
diff --git a/sites/all/modules/contrib/inline_entity_form/inline_entity_form.module b/sites/all/modules/contrib/inline_entity_form/inline_entity_form.module
index 39904a0..710d2bf 100644
--- a/sites/all/modules/contrib/inline_entity_form/inline_entity_form.module
+++ b/sites/all/modules/contrib/inline_entity_form/inline_entity_form.module
@@ -1058,6 +1058,13 @@ function inline_entity_form_close_row_form($form, &$form_state) {
   $ief_id = $element['#ief_id'];
   $delta = $form_state['triggering_element']['#ief_row_delta'];
 
+  $trig_parents = $form_state['triggering_element']['#parents'];
+  $parents = array_merge(array('field', '#parents'), array_slice($trig_parents, 0, count($trig_parents) - 4));
+  $container = &drupal_array_get_nested_value($form_state, $parents);
+  if ($container !== NULL) {
+    unset($container[$delta]);
+  }
+
   $form_state['rebuild'] = TRUE;
   $form_state['inline_entity_form'][$ief_id]['entities'][$delta]['form'] = NULL;
 }