diff --git a/src/unexec.c b/src/unexec.c
index b7aa1e08e99..652aa70e242 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -791,12 +791,13 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
       PERROR (new_name);
     }
 
+#if 0 /* This #ifndef caused a bug on Linux when using QMAGIC.  */
   /* This adjustment was done above only #ifndef NO_REMAP,
      so only undo it now #ifndef NO_REMAP.  */
-#ifndef NO_REMAP
+  /* #ifndef NO_REMAP  */
+#endif
 #ifdef A_TEXT_OFFSET
   hdr.a_text -= A_TEXT_OFFSET (ohdr);
-#endif
 #endif
 
   return 0;