diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 523aff9..a29cf0e 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -88,14 +88,6 @@ function _menu_overview_tree_form($tree) {
       $form[$mlid]['#item'] = $item;
       $form[$mlid]['#attributes'] = $item['hidden'] ? array('class' => array('menu-disabled')) : array('class' => array('menu-enabled'));
       $form[$mlid]['title']['#markup'] = l($item['title'], $item['href'], $item['localized_options']) . ($item['hidden'] ? ' (' . t('disabled') . ')' : '');
-      $form[$mlid]['hidden'] = array(
-        '#type' => 'checkbox',
-        '#default_value' => !$item['hidden'],
-      );
-      $form[$mlid]['expanded'] = array(
-        '#type' => 'checkbox',
-        '#default_value' => $item['expanded'],
-      );
       $form[$mlid]['weight'] = array(
         '#type' => 'weight',
         '#delta' => 50,
@@ -154,7 +146,7 @@ function menu_overview_form_submit($form, &$form_state) {
   $form = array_merge($order, $form); // Update our original form with the new order.
 
   $updated_items = array();
-  $fields = array('expanded', 'weight', 'plid');
+  $fields = array('weight', 'plid');
   foreach (element_children($form) as $mlid) {
     if (isset($form[$mlid]['#item'])) {
       $element = $form[$mlid];
@@ -192,15 +184,13 @@ function theme_menu_overview_form($form) {
 
   $header = array(
     t('Menu link'),
-    array('data' => t('Enabled'), 'class' => array('checkbox')),
-    array('data' => t('Show as expanded'), 'class' => array('checkbox')),
     t('Weight'),
-    array('data' => t('Operations'), 'colspan' => '3'),
+    array('data' => t('Operations'), 'colspan' => '2'),
   );
 
   $rows = array();
   foreach (element_children($form) as $mlid) {
-    if (isset($form[$mlid]['hidden'])) {
+    if (isset($form[$mlid]['mlid'])) {
       $element = &$form[$mlid];
       // Build a list of operations.
       $operations = array();
@@ -221,8 +211,6 @@ function theme_menu_overview_form($form) {
 
       $row = array();
       $row[] = theme('indentation', $element['#item']['depth'] - 1) . drupal_render($element['title']);
-      $row[] = array('data' => drupal_render($element['hidden']), 'class' => array('checkbox'));
-      $row[] = array('data' => drupal_render($element['expanded']), 'class' => array('checkbox'));
       $row[] = drupal_render($element['weight']) . drupal_render($element['plid']) . drupal_render($element['mlid']);
       $row = array_merge($row, $operations);
 
@@ -233,7 +221,7 @@ function theme_menu_overview_form($form) {
   }
   $output = '';
   if (empty($rows)) {
-    $rows[] = array(array('data' => $form['#empty_text'], 'colspan' => '7'));
+    $rows[] = array(array('data' => $form['#empty_text'], 'colspan' => '3'));
   }
   $output .= theme('table', $header, $rows, array('id' => 'menu-overview'));
   $output .= drupal_render_children($form);
@@ -388,11 +376,6 @@ function menu_item_delete_submit($form, &$form_state) {
 function menu_edit_item_submit($form, &$form_state) {
   $item = &$form_state['values']['menu'];
 
-  // The value of "hidden" is the opposite of the value
-  // supplied by the "enabled" checkbox.
-  $item['hidden'] = (int) !$item['enabled'];
-  unset($item['enabled']);
-
   $item['options']['attributes']['title'] = $item['description'];
   list($item['menu_name'], $item['plid']) = explode(':', $item['parent']);
   if (!menu_link_save($item)) {