diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 988c71fed5c..e5de5a7bf58 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-12  Andrew Pinski  <apinski@apple.com>
+
+	PR c++/16475
+	Revert:
+	2004-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+		PR c++/16276
+		* rtti.c (emit_tinfo_decl): Turn off DECL_ONE_ONLY if typeinfo
+		is not public.
+
 2004-07-12  Eric Christopher  <echristo@redhat.com>
 
 	* parser.c (cp_parser_class_head): Remove unused variable.
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index dbc3e40340e..794c38ba168 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -1460,11 +1460,7 @@ emit_tinfo_decl (tree decl)
   DECL_EXTERNAL (decl) = 0;
   TREE_PUBLIC (decl) = !non_public;
   if (non_public)
-    {
-      DECL_COMDAT (decl) = 0;
-      if (SUPPORTS_ONE_ONLY)
-	DECL_ONE_ONLY (decl) = 0;
-    }
+    DECL_COMDAT (decl) = 0;
 
   DECL_INITIAL (decl) = var_init;
   mark_used (decl);