diff --git a/plugins/facetapi/dependency_bundle.inc b/plugins/facetapi/dependency_bundle.inc
index 6648421..b986653 100644
--- a/plugins/facetapi/dependency_bundle.inc
+++ b/plugins/facetapi/dependency_bundle.inc
@@ -16,20 +16,10 @@ class FacetapiDependencyBundle extends FacetapiDependency {
   public function execute() {
     switch ($this->settings['bundle']) {
       case 'referenced':
-        // @todo Do we need defensive coding here?
-        $field_info = field_info_field($this->facet['field api name']);
-
-        // Iterate over field info, collect bundles this field is attached to.
-        $field_bundles = array();
-        foreach ($field_info['bundles'] as $entity => $bundles) {
-          $field_bundles[$entity] = array_flip($bundles);
-        }
-
-        // Check match between the field's bundles and active bundle items.
-        foreach ($this->getEnabledBundleFacets()  as $facet) {
-          foreach ($facet['field api bundles'] as $entity) {
-            $bundles = (isset($field_bundles[$entity])) ? $field_bundles[$entity] : array();
-            if (array_intersect_key($this->activeItems[$facet['name']], $bundles)) {
+        foreach ($this->getEnabledBundleFacets() as $facet) {
+          foreach ($this->activeItems[$facet['name']] as $entity => $facet) {
+            $field_info = content_fields($this->facet['field api name'], $entity);
+            if ($field_info) {
               return NULL;
             }
           }