diff --git a/file_entity.field.inc b/file_entity.field.inc
index 4b039b6..0511e36 100644
--- a/file_entity.field.inc
+++ b/file_entity.field.inc
@@ -282,52 +282,26 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
   if ($display['type'] == 'file_rendered') {
     $view_mode = $settings['file_view_mode'];
 
-    // To prevent infinite recursion caused by reference cycles, we store
-    // diplayed nodes in a recursion queue.
-    $recursion_queue = &drupal_static(__FUNCTION__, array());
-
-    // If no 'referencing entity' is set, we are starting a new 'reference
-    // thread' and need to reset the queue.
-    // @todo Bug: $entity->referencing_entity on files referenced in a different
-    // thread on the page.
-    // E.g: 1 references 1+2 / 2 references 1+2 / visit homepage.
-    // We'd need a more accurate way...
-    if (!isset($entity->referencing_entity)) {
-      $recursion_queue = array();
-    }
-
-    // The recursion queue only needs to track files.
-    if ($entity_type == 'file') {
-      list($id) = entity_extract_ids($entity_type, $entity);
-      $recursion_queue[$id] = $id;
-    }
-
     // Prevent 'empty' fields from causing a WSOD.
     $items = array_filter($items);
 
-    // Check the recursion queue to determine which nodes should be fully
-    // displayed, and which nodes will only be displayed as a title.
+    // Load and build the fully displayed nodes.
     $files_display = array();
     foreach ($items as $delta => $item) {
-      if (!isset($recursion_queue[$item['fid']])) {
-        $files_display[$item['fid']] = file_load($item['fid']);
-        if (!empty($item['description'])) {
-          $files_display[$item['fid']]->description = $item['description'];
-        }
-      }
-    }
-
-    // Load and build the fully displayed nodes.
-    if ($files_display) {
-      foreach ($files_display as $fid => $file) {
-        $files_display[$fid]->referencing_entity = $entity;
-        $files_display[$fid]->referencing_entity_type = $entity_type;
-        $files_display[$fid]->referencing_field = $field['field_name'];
+      $files_display[$item['fid']] = file_load($item['fid']);
+      if (!empty($item['description'])) {
+        $files_display[$item['fid']]->description = $item['description'];
       }
-      $output = file_view_multiple($files_display, $view_mode);
-      // Remove the first level from the output array.
-      $files_built = reset($output);
+      // @todo: Verify if referencing_entity properties are really needed.
+      // They -may- be referenced in the picture and the
+      // file_entity_link modules
+      $files_display[$item['fid']]->referencing_entity = $entity;
+      $files_display[$item['fid']]->referencing_entity_type = $entity_type;
+      $files_display[$item['fid']]->referencing_field = $field['field_name'];
     }
+    $output = file_view_multiple($files_display, $view_mode);
+    // Remove the first level from the output array.
+    $files_built = reset($output);
 
     // Assemble the render array.
     foreach ($items as $delta => $item) {