diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42b8984b1c8..e9273956ae4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-14  Richard Guenther  <rguenth@gcc.gnu.org>
+
+	Revert
+	2005-05-11  Richard Guenther  <rguenth@gcc.gnu.org>
+	* fold-const.c (fold_indirect_ref_1): Avoid removing
+	NOP_EXPRs with type qualifiers like const.
+
 2005-05-14  Jan Hubicka  <jh@suse.cz>
 
 	Patch by Richard Henderson:
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index b19dd85ed66..deb8780b8d5 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11406,7 +11406,7 @@ fold_indirect_ref_1 (tree t)
   tree sub = t;
   tree subtype;
 
-  STRIP_TYPE_NOPS (sub);
+  STRIP_NOPS (sub);
   subtype = TREE_TYPE (sub);
   if (!POINTER_TYPE_P (subtype))
     return NULL_TREE;