diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 822e802..6ab580a 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -449,13 +449,11 @@ function field_modules_disabled($modules) {
 function field_sync_field_status() {
   // Refresh the 'active' and 'storage_active' columns according to the current
   // set of enabled modules.
-  $all_modules = system_rebuild_module_data();
+  $enabled_modules = module_list();
   $modules = array();
-  foreach ($all_modules as $module_name => $module) {
-    if ($module->status) {
-      $modules[] = $module_name;
-      field_associate_fields($module_name);
-    }
+  foreach ($enabled_modules as $module_name) {
+    $modules[] = $module_name;
+    field_associate_fields($module_name);
   }
   db_update('field_config')
     ->fields(array('active' => 0))
