diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 6dca80b..33c594a 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -773,8 +773,6 @@ function system_modules($form, $form_state = array()) {
     }
   }
 
-  uasort($visible_files, 'system_sort_modules_by_info_name');
-
   // If the modules form was submitted, then system_modules_submit() runs first
   // and if there are unfilled required modules, then $form_state['storage'] is
   // filled, triggering a rebuild. In this case we need to display a
@@ -784,7 +782,17 @@ function system_modules($form, $form_state = array()) {
   }
 
   $modules = array();
-  $form['modules'] = array('#tree' => TRUE);
+  $form['modules'] = array(
+    '#tree' => TRUE,
+    '#theme' => 'system_modules_fieldset',
+    '#header' => array(
+      array('data' => t('Enabled'), 'class' => array('checkbox')),
+      t('Name'),
+      t('Version'),
+      t('Description'),
+      array('data' => t('Operations'), 'colspan' => 3),
+    ),
+  );
 
   // Used when checking if module implements a help page.
   $help_arg = module_exists('help') ? drupal_help_arg() : FALSE;
@@ -883,31 +891,9 @@ function system_modules($form, $form_state = array()) {
         }
       }
     }
-    $form['modules'][$module->info['package']][$filename] = _system_modules_build_row($module->info, $extra);
-  }
-
-  // Add basic information to the fieldsets.
-  foreach (element_children($form['modules']) as $package) {
-    $form['modules'][$package] += array(
-      '#type' => 'fieldset',
-      '#title' => t($package),
-      '#collapsible' => TRUE,
-      '#theme' => 'system_modules_fieldset',
-      '#header' => array(
-        array('data' => t('Enabled'), 'class' => array('checkbox')),
-        t('Name'),
-        t('Version'),
-        t('Description'),
-        array('data' => t('Operations'), 'colspan' => 3),
-      ),
-      // Ensure that the "Core" package fieldset comes first.
-      '#weight' => $package == 'Core' ? -10 : NULL,
-    );
+    $form['modules'][$filename] = _system_modules_build_row($module->info, $extra);
   }
 
-  // Lastly, sort all fieldsets by title.
-  uasort($form['modules'], 'element_sort_by_title');
-
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 625be0a..8a0f13b 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2370,7 +2370,6 @@ function _system_rebuild_module_data() {
   $defaults = array(
     'dependencies' => array(),
     'description' => '',
-    'package' => 'Other',
     'version' => NULL,
     'php' => DRUPAL_MINIMUM_PHP,
     'files' => array(),