Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.248
diff -u -p -r1.248 locale.module
--- modules/locale/locale.module	12 Aug 2009 12:36:04 -0000	1.248
+++ modules/locale/locale.module	14 Aug 2009 19:02:18 -0000
@@ -76,8 +76,7 @@ function locale_menu() {
    'position' => 'left',
    'weight' => -7,
    'page callback' => 'system_admin_menu_block_page',
-   'access callback' => 'system_admin_menu_block_access',
-   'access arguments' => array('admin/config/international', 'access administration pages'),
+   'access arguments' => array('access administration pages'),
   );
   $items['admin/config/international/language'] = array(
     'title' => 'Languages',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.745
diff -u -p -r1.745 system.module
--- modules/system/system.module	14 Aug 2009 14:00:14 -0000	1.745
+++ modules/system/system.module	14 Aug 2009 19:02:21 -0000
@@ -522,8 +522,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'),
   );
   $items['admin/structure'] = array(
     'title' => 'Structure',
@@ -531,8 +530,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'),
   );
   // Appearance.
   $items['admin/appearance'] = array(
@@ -680,8 +678,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'),
   );
   $items['admin/config/development/maintenance'] = array(
     'title' => 'Maintenance mode',
@@ -767,8 +764,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',
   );
@@ -1197,25 +1193,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() {