diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66b07ac15c..360b7b66dc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 28 08:45:02 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* c-exp.y (yylex): Reenable nested type code.
+
 Fri Jan 28 15:40:33 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* a29k-tdep.c (examine_tag): Add comment regarding argcount.
@@ -25,6 +29,7 @@ Fri Jan 28 11:55:52 1994  Rob Savoye  (rob@darkstar.cygnus.com)
 	addition to the standard serial support.
 
 Fri Jan 28 08:45:02 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+>>>>>>> 1.2186
 
 	* mdebugread.c (psymtab_to_symtab_1): Don't complain on stLabel with
 	index indexNil.
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 72639799d6..8860dfc784 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1522,7 +1522,11 @@ yylex ()
       }
     if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
         {
-#if 0
+#if 1
+	  /* Despite the following flaw, we need to keep this code enabled.
+	     Because we can get called from check_stub_method, if we don't
+	     handle nested types then it screws many operations in any
+	     program which uses nested types.  */
 	  /* In "A::x", if x is a member function of A and there happens
 	     to be a type (nested or not, since the stabs don't make that
 	     distinction) named x, then this code incorrectly thinks we