diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
old mode 100644
new mode 100755
index 482f096..9df3d6d
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -180,18 +180,23 @@ function _file_generic_settings_file_directory_validate($element, &$form_state)
 }
 
 /**
- * Implements hook_field_load().
+ * Implements hook_field_prepare_view().
  */
-function file_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
-
+function file_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
+  // Remove files specified to not be displayed.
   $fids = array();
   foreach ($entities as $id => $entity) {
-    // Load the files from the files table.
     foreach ($items[$id] as $delta => $item) {
-      if (!empty($item['fid'])) {
+      if (!file_field_displayed($item, $field)) {
+        unset($items[$id][$delta]);
+      }
+      elseif (!empty($item['fid'])) {
+        // Load the files from the files table.
         $fids[] = $item['fid'];
       }
     }
+    // Ensure consecutive deltas.
+    $items[$id] = array_values($items[$id]);
   }
   $files = file_load_multiple($fids);
 
@@ -209,22 +214,6 @@ function file_field_load($entity_type, $entities, $field, $instances, $langcode,
 }
 
 /**
- * Implements hook_field_prepare_view().
- */
-function file_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
-  // Remove files specified to not be displayed.
-  foreach ($entities as $id => $entity) {
-    foreach ($items[$id] as $delta => $item) {
-      if (!file_field_displayed($item, $field)) {
-        unset($items[$id][$delta]);
-      }
-    }
-    // Ensure consecutive deltas.
-    $items[$id] = array_values($items[$id]);
-  }
-}
-
-/**
  * Implements hook_field_presave().
  */
 function file_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc
index 0fb657c..446726a 100644
--- a/core/modules/image/image.field.inc
+++ b/core/modules/image/image.field.inc
@@ -180,16 +180,11 @@ function _image_field_resolution_validate($element, &$form_state) {
 }
 
 /**
- * Implements hook_field_load().
- */
-function image_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
-  file_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age);
-}
-
-/**
  * Implements hook_field_prepare_view().
  */
 function image_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
+  // Load the images.
+  file_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, $items);
   // If there are no files specified at all, use the default.
   foreach ($entities as $id => $entity) {
     if (empty($items[$id])) {