diff --git a/modules/ds_search/ds_search.module b/modules/ds_search/ds_search.module
index 89ad1c7..47045fb 100644
--- a/modules/ds_search/ds_search.module
+++ b/modules/ds_search/ds_search.module
@@ -218,15 +218,7 @@ function ds_entity_view_fallback($entity_type, $entities, $view_mode = 'full', $
 
   // Entity support for entity search.
   if (module_exists('entity')) {
-    $info = entity_get_info($entity_type);
-    if (isset($info['view callback'])) {
-      $entities = ds_entity_key_array_by_property($entities, $info['entity keys']['id']);
-      return $info['view callback']($entities, $view_mode, $langcode, $entity_type);
-    }
-    elseif (in_array('EntityAPIControllerInterface', class_implements($info['controller class']))) {
-      return entity_get_controller($entity_type)->view($entities, $view_mode, $langcode, $page);
-    }
-    return FALSE;
+    return entity_view($entity_type, $entities, $view_mode, $langcode, $page);
   }
   else {
     if ($entity_type == 'node') {
@@ -239,18 +231,6 @@ function ds_entity_view_fallback($entity_type, $entities, $view_mode = 'full', $
 }
 
 /**
- * DS entity key array by property.
- */
-function ds_entity_key_array_by_property(array $entities, $property) {
-  $ret = array();
-  foreach ($entities as $entity) {
-    $key = isset($entity->$property) ? $entity->$property : NULL;
-    $ret[$key] = $entity;
-  }
-  return $ret;
-}
-
-/**
  * Implements hook_search_page().
  */
 function ds_search_search_page($results) {