diff --git a/usr/share/rear/prep/default/310_include_uefi_tools.sh b/usr/share/rear/prep/default/330_include_uefi_tools.sh
similarity index 58%
rename from usr/share/rear/prep/default/310_include_uefi_tools.sh
rename to usr/share/rear/prep/default/330_include_uefi_tools.sh
index 61f973a..c910d36 100644
--- a/usr/share/rear/prep/default/310_include_uefi_tools.sh
+++ b/usr/share/rear/prep/default/330_include_uefi_tools.sh
@@ -1,14 +1,9 @@
-# When /boot/efi is mounted we copy the UEFI binaries we might need
+#
+# Copy UEFI binaries we might need into the ReaR recovery system.
+#
 
-# If noefi is set, we can ignore UEFI altogether
-if grep -qw 'noefi' /proc/cmdline; then
-    return
-fi
-
-# next step, is checking /boot/efi directory (we need it)
-if [[ ! -d /boot/efi ]]; then
-    return    # must be mounted
-fi
+# Include UEFI tools on demand only
+is_true $USING_UEFI_BOOTLOADER || return
 
 REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}"
 dosfsck