diff --git a/Debug/efidebug.tool b/Debug/efidebug.tool
index aeeab8ae..d9c5f84a 100755
--- a/Debug/efidebug.tool
+++ b/Debug/efidebug.tool
@@ -135,12 +135,7 @@ choose_debugger() {
 choose_debugger
 
 if [ "${EFI_DEBUGGER}" = "GDB" ] || [ "${EFI_DEBUGGER}" = "gdb" ]; then
-  if [ "${EFI_ARCH}" = "Ia32" ]; then
-    arch=i386:x86-64:intel
-  else
-    arch=x86-64:intel
-  fi
-  "${GDB}" -ex "set arch ${arch}" \
+  "${GDB}" -ex "set arch i386:x86-64:intel" \
     -ex "target remote ${EFI_HOST}:${EFI_PORT}" \
     -ex "source Scripts/gdb_uefi.py" \
     -ex "set pagination off" \