diff --git a/stand/forth/efi.4th b/stand/forth/efi.4th
index 8b58aee1ea46..ce7da92b3e2b 100644
--- a/stand/forth/efi.4th
+++ b/stand/forth/efi.4th
@@ -26,16 +26,5 @@
 
 only forth definitions
 
-: efiboot? ( -- flag )
-	s" efi-version" getenv -1 <> dup if
-		swap drop ( c-addr flag -- flag )
-	then
-;
-
-: maybe-efi-resizecons
-	efiboot? if
-		s" efi-autoresizecons" evaluate
-	then
-;
-
+s" efi-autoresizecons" evaluate
 .( EFI boot environment) cr
diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th
index 6c2f7b378f6b..0c3502cb44eb 100644
--- a/stand/forth/loader.4th
+++ b/stand/forth/loader.4th
@@ -46,6 +46,9 @@ include /boot/support.4th
 include /boot/color.4th
 include /boot/delay.4th
 include /boot/check-password.4th
+s" efi-version" getenv? [if]
+	include /boot/forth/efi.4th
+[then]
 
 only forth definitions
 
diff --git a/stand/forth/loader.rc b/stand/forth/loader.rc
index d898a7de6354..0bc66579cd0f 100644
--- a/stand/forth/loader.rc
+++ b/stand/forth/loader.rc
@@ -6,15 +6,12 @@
 \
 \ Includes additional commands
 include /boot/loader.4th
-include /boot/efi.4th
 try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
 \ NOTE: Change to `initialize' if you enable the below boot menu
 start
 
-maybe-efi-resizecons
-
 \ Tests for password -- executes autoboot first if a password was defined
 check-password