diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh
index 6426dea9f0..6149131760 100755
--- a/build_library/grub_install.sh
+++ b/build_library/grub_install.sh
@@ -183,11 +183,9 @@ sudo grub-mkimage \
     --output "${ESP_DIR}/${GRUB_DIR}/${CORE_NAME}" \
     "${CORE_MODULES[@]}"
 
-if [[ "${FLAGS_target}" != i386-pc ]]; then
-    for mod in "${CORE_MODULES[@]}"; do
-      sudo rm "${ESP_DIR}/${GRUB_DIR}/${mod}.mod"
-    done
-fi
+for mod in "${CORE_MODULES[@]}"; do
+    sudo rm "${ESP_DIR}/${GRUB_DIR}/${mod}.mod"
+done
 
 # Now target specific steps to make the system bootable
 case "${FLAGS_target}" in