Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.767
diff -u -p -r1.767 system.module
--- modules/system/system.module	24 Aug 2009 12:32:10 -0000	1.767
+++ modules/system/system.module	24 Aug 2009 21:55:16 -0000
@@ -556,8 +556,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -2,
     'page callback' => 'system_settings_overview',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/settings', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/structure'] = array(
@@ -566,8 +565,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -8,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/structure', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   // Appearance.
@@ -667,8 +665,7 @@ function system_menu() {
     'position' => 'right',
     'weight' => -7,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/development', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
 
@@ -745,8 +742,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => 10,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/development', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/development/maintenance'] = array(
@@ -771,8 +767,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => 10,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/media', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/media/file-system'] = array(
@@ -813,8 +808,7 @@ function system_menu() {
     'position' => 'left',
     'weight' => -7,
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/config/regional', 'access administration pages'),
+    'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
   $items['admin/config/regional/settings'] = array(
@@ -873,8 +867,7 @@ function system_menu() {
     'title' => 'Reports',
     'description' => 'View reports from system logs and other status information.',
     'page callback' => 'system_admin_menu_block_page',
-    'access callback' => 'system_admin_menu_block_access',
-    'access arguments' => array('admin/reports', 'access site reports'),
+    'access arguments' => array('access site reports'),
     'weight' => 5,
     'position' => 'left',
     'file' => 'system.admin.inc',
@@ -1308,25 +1301,6 @@ function _system_themes_access($theme) {
 }
 
 /**
- * Menu item access callback - hides empty system settings overview pages.
- *
- * @param $path
- *   The path of the menu item to check for child menu entries.
- * @param $string
- *   The permission, such as "administer nodes", being checked for.
- * @return
- *   Boolean TRUE if the current user has the requested permission and the
- *   current menu item has children.
- */
-function system_admin_menu_block_access($path, $permission) {
-  if (!user_access($permission)) {
-    return FALSE;
-  }
-  $content = system_admin_menu_block(array('path' => $path));
-  return !empty($content);
-}
-
-/**
  * Implement hook_filetransfer_backends().
  */
 function system_filetransfer_backends() {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1030
diff -u -p -r1.1030 user.module
--- modules/user/user.module	24 Aug 2009 00:14:23 -0000	1.1030
+++ modules/user/user.module	24 Aug 2009 21:55:21 -0000
@@ -1379,8 +1379,7 @@ function user_menu() {
    'description' => 'Configure user accounts, roles and permissions.',
    'position' => 'right',
    'page callback' => 'system_admin_menu_block_page',
-   'access callback' => 'system_admin_menu_block_access',
-   'access arguments' => array('admin/config/people', 'access administration pages'),
+   'access arguments' => array('access administration pages'),
   );
   $items['admin/config/people/accounts'] = array(
     'title' => 'Account settings',