diff --git a/gas/ChangeLog b/gas/ChangeLog
index 973a887551..f98a14d034 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Eric Christopher  <echristo@redhat.com>
+
+        * config/tc-mips.c (mips_dwarf2_addr_size): Revert part
+        of previous patch for fix in gcc.
+
 2004-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/tc-xtensa.c (xg_assembler_literal): Fix a typo.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index e47266b552..7b6cee85df 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -14426,10 +14426,6 @@ mips_dwarf2_addr_size (void)
 {
   if (mips_abi == N64_ABI)
     return 8;
-  /* GCC for 64-bit targets turns on mlong64 giving
-     us 64-bit addresses.  */
-  else if (mips_abi == EABI_ABI && !file_mips_gp32)
-    return 8;
   else
     return 4;
 }