diff --git a/field_permissions.admin.inc b/field_permissions.admin.inc
index fde3730..8353936 100644
--- a/field_permissions.admin.inc
+++ b/field_permissions.admin.inc
@@ -335,26 +335,25 @@ function field_permissions_overview() {
   }
   $destination = drupal_get_destination();
 
-  // Load list of field instances, types and bundles in the system.
-  $instances = field_info_instances();
+  // Load list of fields, field types and bundles in the system.
+  $fields = field_info_fields();
   $field_types = field_info_field_types();
-  $bundles = field_info_bundles();
+  $bundles_info = field_info_bundles();
 
   // Retrieve the permissions for each role.
   $role_permissions = user_role_permissions(user_roles());
 
   // Based on field_ui_fields_list() in field_ui.admin.inc.
   $rows = array();
-  foreach ($instances as $obj_type => $type_bundles) {
-    foreach ($type_bundles as $bundle => $bundle_instances) {
-      foreach ($bundle_instances as $field_name => $instance) {
+  foreach (field_info_fields() as $field_name => $field) {
+    foreach ($field['bundles'] as $entity_type => $bundles) {
+      foreach ($bundles as $bundle) {
         // Each field will have a row in the table.
-        $field = field_info_field($field_name);
-        $admin_path = _field_ui_bundle_admin_path($obj_type, $bundle);
+        $admin_path = _field_ui_bundle_admin_path($entity_type, $bundle);
         $rows[$field_name]['data'][0] = $field['locked'] ? t('@field_name (Locked)', array('@field_name' => $field_name)) : $field_name;
         $rows[$field_name]['data'][1] = t($field_types[$field['type']]['label']);
-        $rows[$field_name]['data'][2] = $obj_type;
-        $rows[$field_name]['data'][3][] = l($bundles[$obj_type][$bundle]['label'], $admin_path . '/fields/'. $field_name, array(
+        $rows[$field_name]['data'][2] = $entity_type;
+        $rows[$field_name]['data'][3][] = l($bundles_info[$entity_type][$bundle]['label'], $admin_path . '/fields/'. $field_name, array(
           'query' => $destination,
           'fragment' => 'edit-field-field-permissions-type',
         ));