diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4a24c422c0..d5d81f7fba 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Tue Jan  5 11:55:57 1999  David Taylor  <taylor@texas.cygnus.com>
 
+	* c-valprint.c (c_value_print): remove hack^2 from HP; it causes
+	testsuite losses with no real gain.
+
 	* inferior.h (START_INFERIOR_TRAPS_EXPECTED): restore, but only
 	if tm-*.h hasn't overridden default value.
 
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 6bc49c3f50..7a9c6bec0d 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -468,17 +468,10 @@ c_value_print (val, stream, format, pretty)
     {
       /* Hack:  remove (char *) for char strings.  Their
 	 type is indicated by the quoted string anyway. */
-      /* Hack^2: ensure that const char *, const unsigned char *
-         come out without the type but the volatile variants
-         and the signed variants don't. */
       if (TYPE_CODE (type) == TYPE_CODE_PTR &&
 	  TYPE_NAME (type) == NULL &&
 	  TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL &&
-	  STREQ (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char") &&
-          !TYPE_VOLATILE (TYPE_TARGET_TYPE (type)) &&
-          (TYPE_UNSIGNED (TYPE_TARGET_TYPE (type)) || TYPE_NOSIGN (TYPE_TARGET_TYPE (type))) &&
-          !TYPE_VOLATILE (type) &&
-          !TYPE_CONST (type))
+	  STREQ (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char"))
 	{
 	  /* Print nothing */
 	}