diff -u b/core/modules/system/tests/upgrade/drupal-7.field.database.php b/core/modules/system/tests/upgrade/drupal-7.field.database.php
--- b/core/modules/system/tests/upgrade/drupal-7.field.database.php
+++ b/core/modules/system/tests/upgrade/drupal-7.field.database.php
@@ -90,7 +90,7 @@
     )),
     'cardinality' => 1,
     'translatable' => 0,
-    'deleted' => 1,
+    'deleted' => 0,
   ))
   ->execute();
 db_insert('field_config_instance')
@@ -126,7 +126,7 @@
         ),
       ),
     )),
-    'deleted' => 1
+    'deleted' => 0
   ))
   ->execute();
 db_insert('field_config_instance')
@@ -162,7 +162,7 @@
         ),
       ),
     )),
-    'deleted' => 1
+    'deleted' => 0
   ))
   ->execute();
 // Create the corresponding storage tables.
@@ -209,7 +209,7 @@
     ),
     'test_shared_field_value' => array(
       'type' => 'varchar',
-      'size' => 255,
+      'length' => 255,
       'not null' => FALSE,
     ),
     'test_shared_field_format' => array(
only in patch2:
unchanged:
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -372,7 +372,7 @@ function field_update_8003() {
 
     // Store the UUID and field type, they will be used when processing
     // instances.
-    $field_data[$record['id']] = array(
+    $field_data[$record['entity_type'] . ':' . $record['id']] = array(
       'uuid' => $config['uuid'],
       'type' => $record['type'],
     );
@@ -383,11 +383,12 @@ function field_update_8003() {
   foreach ($records as $record) {
     $record['data'] = unserialize($record['data']);
 
+    $field_data_key = $record['entity_type'] . ':' . $record['field_id'];
     $config = array(
       'id' => $record['entity_type'] . '.' . $record['bundle'] . '.' . $record['field_name'],
       'uuid' => $uuid->generate(),
-      'field_uuid' => $field_data[$record['field_id']]['uuid'],
-      'field_type' => $field_data[$record['field_id']]['type'],
+      'field_uuid' => $field_data[$field_data_key]['uuid'],
+      'field_type' => $field_data[$field_data_key]['type'],
       'entity_type' => $record['entity_type'],
       'bundle' => $record['bundle'],
       'label' => $record['data']['label'],