diff --git a/ChangeLog b/ChangeLog
index 73548c440..900c2d18b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSMenu.m (-upate, -setAutoenablesItems:, initWithCoder):
+	Revert NSMenu changes from r27569.
+
 2009-01-17  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSDocument.m (-windowForSheet): Return nil if the
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 752e4a379..3be6ce57f 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -933,7 +933,6 @@ static BOOL menuBarVisible = YES;
 - (void) setAutoenablesItems: (BOOL)flag
 {
   _menu.autoenable = flag;
-  [self update];
 }
 
 - (BOOL) autoenablesItems
@@ -1057,20 +1056,6 @@ static BOOL menuBarVisible = YES;
       // Reenable displaying of menus
       [self setMenuChangedMessagesEnabled: YES];
     }
-  else
-    {
-      id<NSMenuItem> item = nil;
-      NSEnumerator *en = [_items objectEnumerator];
-     
-      //
-      // If the menu items are not autoenabled, they should be enabled by default
-      // sincer we're not checking them.
-      //
-      while((item = [en nextObject]) != nil)
-	{
-	  [item setEnabled: YES];
-	}
-    }
 
   if (_menu.needsSizing && ([_aWindow isVisible] || [_bWindow isVisible]))
     {
@@ -1435,7 +1420,7 @@ static BOOL menuBarVisible = YES;
 	}
       else
 	{
-	  dAuto = YES; // if the no-autoenable flag isn't present, then autoenable.
+	  dAuto = NO;
 	}
       dTitle = [aDecoder decodeObjectForKey: @"NSTitle"];
       dItems = [aDecoder decodeObjectForKey: @"NSMenuItems"];