diff --git a/core/authorize.php b/core/authorize.php
index 26d310d..d823ed3 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -80,7 +80,7 @@ global $conf;
 // display errors via the maintenance theme.
 $module_list['system']['filename'] = 'core/modules/system/system.module';
 $module_list['user']['filename'] = 'core/modules/user/user.module';
-module_list(TRUE, FALSE, FALSE, $module_list);
+module_list(TRUE, FALSE, $module_list);
 drupal_load('module', 'system');
 drupal_load('module', 'user');
 
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index fefa670..07d3a86 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -257,7 +257,7 @@ function install_begin_request(&$install_state) {
   $module_list['system']['filename'] = 'core/modules/system/system.module';
   $module_list['entity']['filename'] = 'core/modules/entity/entity.module';
   $module_list['user']['filename']   = 'core/modules/user/user.module';
-  module_list(TRUE, FALSE, FALSE, $module_list);
+  module_list(TRUE, FALSE, $module_list);
   drupal_load('module', 'system');
   drupal_load('module', 'entity');
   drupal_load('module', 'user');
diff --git a/core/includes/module.inc b/core/includes/module.inc
index cca2ef9..199d08f 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -49,9 +49,6 @@ function module_load_all($bootstrap = FALSE) {
  *   the module list to be regenerated using the reduced set of modules loaded
  *   in "bootstrap mode" for cached pages. Otherwise, setting $refresh to TRUE
  *   generates the complete list of enabled modules.
- * @param $sort
- *   (optional) By default, modules are ordered by weight and module name. Set
- *   this option to TRUE to return a module list ordered only by module name.
  * @param $fixed_list
  *   (optional) If an array of module names is provided, this will override the
  *   module list with the given set of modules. This will persist until the next
@@ -63,12 +60,11 @@ function module_load_all($bootstrap = FALSE) {
  *   An associative array whose keys and values are the names of the modules in
  *   the list.
  */
-function module_list($refresh = FALSE, $bootstrap_refresh = FALSE, $sort = FALSE, $fixed_list = NULL) {
+function module_list($refresh = FALSE, $bootstrap_refresh = FALSE, $fixed_list = NULL) {
   static $list = array(), $sorted_list;
 
   if (empty($list) || $refresh || $fixed_list) {
     $list = array();
-    $sorted_list = NULL;
     if ($fixed_list) {
       foreach ($fixed_list as $name => $module) {
         drupal_get_filename('module', $name, $module['filename']);
@@ -91,13 +87,6 @@ function module_list($refresh = FALSE, $bootstrap_refresh = FALSE, $sort = FALSE
       }
     }
   }
-  if ($sort) {
-    if (!isset($sorted_list)) {
-      $sorted_list = $list;
-      ksort($sorted_list);
-    }
-    return $sorted_list;
-  }
   return $list;
 }
 
@@ -618,16 +607,13 @@ function module_hook($module, $hook) {
  *
  * @param $hook
  *   The name of the hook (e.g. "help" or "menu").
- * @param $sort
- *   By default, modules are ordered by weight and filename, settings this option
- *   to TRUE, module list will be ordered by module name.
  *
  * @return
  *   An array with the names of the modules which are implementing this hook.
  *
  * @see module_implements_write_cache()
  */
-function module_implements($hook, $sort = FALSE) {
+function module_implements($hook) {
   // Use the advanced drupal_static() pattern, since this is called very often.
   static $drupal_static_fast;
   if (!isset($drupal_static_fast)) {
@@ -652,7 +638,7 @@ function module_implements($hook, $sort = FALSE) {
     $implementations['#write_cache'] = TRUE;
     $hook_info = module_hook_info();
     $implementations[$hook] = array();
-    $list = module_list(FALSE, FALSE, $sort);
+    $list = module_list();
     foreach ($list as $module) {
       $include_file = isset($hook_info[$hook]['group']) && module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']);
       // Since module_hook() may needlessly try to load the include file again,
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index d663d14..89c5085 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -50,7 +50,7 @@ function _drupal_maintenance_theme() {
   // Ensure that system.module is loaded.
   if (!function_exists('_system_rebuild_theme_data')) {
     $module_list['system']['filename'] = 'core/modules/system/system.module';
-    module_list(TRUE, FALSE, FALSE, $module_list);
+    module_list(TRUE, FALSE, $module_list);
     drupal_load('module', 'system');
   }
 
diff --git a/core/modules/help/help.admin.inc b/core/modules/help/help.admin.inc
index b37819b..c38d16c 100644
--- a/core/modules/help/help.admin.inc
+++ b/core/modules/help/help.admin.inc
@@ -68,7 +68,7 @@ function help_links_as_list() {
   $module_info = system_rebuild_module_data();
 
   $modules = array();
-  foreach (module_implements('help', TRUE) as $module) {
+  foreach (module_implements('help') as $module) {
     if (module_invoke($module, 'help', "admin/help#$module", $empty_arg)) {
       $modules[$module] = $module_info[$module]->info['name'];
     }
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 773a52d..be4e6d7 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -18,7 +18,7 @@ function help_menu() {
     'file' => 'help.admin.inc',
   );
 
-  foreach (module_implements('help', TRUE) as $module) {
+  foreach (module_implements('help') as $module) {
     $items['admin/help/' . $module] = array(
       'title' => $module,
       'page callback' => 'help_page',
diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php
index 9d993d4..579936f 100644
--- a/core/modules/simpletest/drupal_web_test_case.php
+++ b/core/modules/simpletest/drupal_web_test_case.php
@@ -689,7 +689,7 @@ class DrupalUnitTestCase extends DrupalTestCase {
     if (isset($module_list['locale'])) {
       $this->originalModuleList = $module_list;
       unset($module_list['locale']);
-      module_list(TRUE, FALSE, FALSE, $module_list);
+      module_list(TRUE, FALSE, $module_list);
     }
   }
 
@@ -703,7 +703,7 @@ class DrupalUnitTestCase extends DrupalTestCase {
     $conf['file_public_path'] = $this->originalFileDirectory;
     // Restore modules if necessary.
     if (isset($this->originalModuleList)) {
-      module_list(TRUE, FALSE, FALSE, $this->originalModuleList);
+      module_list(TRUE, FALSE, $this->originalModuleList);
     }
   }
 }
diff --git a/core/modules/simpletest/tests/module.test b/core/modules/simpletest/tests/module.test
index c9601c9..843c768 100644
--- a/core/modules/simpletest/tests/module.test
+++ b/core/modules/simpletest/tests/module.test
@@ -59,7 +59,7 @@ class ModuleUnitTest extends DrupalWebTestCase {
       'system' => array('filename' => drupal_get_path('module', 'system')),
       'menu' => array('filename' => drupal_get_path('module', 'menu')),
     );
-    module_list(FALSE, FALSE, FALSE, $fixed_list);
+    module_list(FALSE, FALSE, $fixed_list);
     $new_module_list = array_combine(array_keys($fixed_list), array_keys($fixed_list));
     $this->assertModuleList($new_module_list, t('When using a fixed list'));
 
@@ -77,8 +77,6 @@ class ModuleUnitTest extends DrupalWebTestCase {
   protected function assertModuleList(Array $expected_values, $condition) {
     $expected_values = array_combine($expected_values, $expected_values);
     $this->assertEqual($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition)));
-    ksort($expected_values);
-    $this->assertIdentical($expected_values, module_list(FALSE, FALSE, TRUE), t('@condition: module_list() returns correctly sorted results', array('@condition' => $condition)));
   }
 
   /**
diff --git a/core/update.php b/core/update.php
index d1a0940..8ffb791 100644
--- a/core/update.php
+++ b/core/update.php
@@ -375,7 +375,7 @@ if (empty($op) && update_access_allowed()) {
   // Load module basics.
   include_once DRUPAL_ROOT . '/core/includes/module.inc';
   $module_list['system']['filename'] = 'core/modules/system/system.module';
-  module_list(TRUE, FALSE, FALSE, $module_list);
+  module_list(TRUE, FALSE, $module_list);
   drupal_load('module', 'system');
 
   // Reset the module_implements() cache so that any new hook implementations