diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 1b9ee60..6d36556 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -250,9 +250,9 @@ function file_update_8000() {
 * Comvert image field's default image configuration to the new format.
 */
 function file_update_8001() {
-  $fields = field_info_fields();
-  foreach ($fields as $field) {
-    if ($field['type'] == 'image') {
+  if (module_exists('field_sql_storage')) {
+    $fields = field_read_fields(array('type' => 'image'));
+    foreach ($fields as $field) {
       if (!empty($field['settings']['default_image'])) {
         $field['settings']['default_image'] = array($field['settings']['default_image']);
       }
@@ -261,18 +261,15 @@ function file_update_8001() {
       }
       field_update_field($field);
 
-      foreach ($field['bundles'] as $etype => $bundles) {
-        foreach ($bundles as $bundle) {
-          if ($instance = field_read_instance($etype, $field['field_name'], $bundle)) {
-            if (!empty($instance['settings']['default_image'])) {
-              $instance['settings']['default_image'] = array($instance['settings']['default_image']);
-            }
-            else {
-              $instance['settings']['default_image'] = array();
-            }
-            field_update_instance($instance);
-          }
+      $instances = field_read_instances(array('field_name' => $field['field_name']));
+      foreach ($instances as $instance) {
+        if (!empty($instance['settings']['default_image'])) {
+          $instance['settings']['default_image'] = array($instance['settings']['default_image']);
         }
+        else {
+          $instance['settings']['default_image'] = array();
+        }
+        field_update_instance($instance);
       }
     }
   }