diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d941d33ac9..89a97236f1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* ax-gdb.c (gen_usual_unary): Remove special handling of
+	enum and bool types.
+
 2012-03-13  Joel Brobecker  <brobecker@adacore.com>
 
 	* ax-gdb.c (gen_fetch): Add handling for TYPE_CODE_RANGE types.
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 126a4e74d1..a76e781720 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -880,12 +880,6 @@ gen_usual_unary (struct expression *exp, struct agent_expr *ax,
     case TYPE_CODE_STRUCT:
     case TYPE_CODE_UNION:
       return;
-
-      /* If the value is an enum or a bool, call it an integer.  */
-    case TYPE_CODE_ENUM:
-    case TYPE_CODE_BOOL:
-      value->type = builtin_type (exp->gdbarch)->builtin_int;
-      break;
     }
 
   /* If the value is an lvalue, dereference it.  */