diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9feacb451bc9..38ac6076e753 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-02  Richard Guenther  <rguenther@suse.de>
+
+	PR c++/28479
+	Revert
+	2006-07-05  Richard Guenther  <rguenther@suse.de>
+	Andrew Pinski  <pinskia@gcc.gnu.org>
+
+	PR c++/27084
+	* cp-objcp-common.c (cxx_types_compatible_p): Ignore
+	top level qualifiers for pointer type comparisons.
+
 2006-08-02  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/28557
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index 0b27abf101ec..cb8369cb53b2 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -179,8 +179,7 @@ cxx_types_compatible_p (tree x, tree y)
   if (POINTER_TYPE_P (x) && POINTER_TYPE_P (y)
       && TYPE_MODE (x) == TYPE_MODE (y)
       && TYPE_REF_CAN_ALIAS_ALL (x) == TYPE_REF_CAN_ALIAS_ALL (y)
-      && same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (x),
-						    TREE_TYPE (y)))
+      && same_type_p (TREE_TYPE (x), TREE_TYPE (y)))
     return 1;
 
   return 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4df1b9a5945c..0cda1a533990 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-02  Richard Guenther  <rguenther@suse.de>
+
+	* g++.dg/tree-ssa/copyprop-1.C: XFAIL.
+
 2006-08-02  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/28557
diff --git a/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C b/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C
index 2be046915378..d12b11a435ce 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C
@@ -25,5 +25,5 @@ int foo(Object&o)
   return o[0];
 }
 
-/* { dg-final { scan-tree-dump-not ".* = \[^>;\]*;" "dce2" } } */
+/* { dg-final { scan-tree-dump-not ".* = \[^>;\]*;" "dce2" { xfail *-*-* } } } */
 /* { dg-final { cleanup-tree-dump "dce2" } } */