diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fa49a4d229..baa2287de0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-07  Andrew Cagney  <cagney@gnu.org>
 
+	* gdbtypes.c (_initialize_gdbtypes): Do not swap builtin_type_int8
+	through to builtin_type_uint128.
+
 	* c-exp.y: Use builtin_type function to obtain builtin types.
 
 	* gdbtypes.h (struct builtin_type): Delete builtin_int0 through to
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 4d00aab041..5a00c12345 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3521,16 +3521,6 @@ _initialize_gdbtypes (void)
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_complex);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_double_complex);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_string);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int8);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint8);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int16);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint16);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int32);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint32);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int64);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint64);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int128);
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint128);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4sf);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4si);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v16qi);