diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 918dd6b50156..07aa1ce05369 100755
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -44,9 +44,9 @@ do_installworld=true
 do_image=true
 do_copyout_partition=true
 do_native_xtools=false
-# Don't do the legacy build unless we detect 'old' variables being
-# set.
-do_legacy=false
+
+# Pull in legacy stuff for now automatically
+. "${topdir}/legacy.sh"
 
 set +e
 args=`getopt BKXWbc:fhiknqvw $*`
@@ -134,15 +134,6 @@ if [ $# -gt 0 ] ; then
 	usage
 fi
 
-if [ -n "$NANO_HEADS" -o -n "$NANO_SECTS" ]; then
-	do_legacy=true
-fi
-
-# If this uses the old, legacy image system, pull that in as well
-if $do_legacy ; then
-	. "${topdir}/legacy.sh"
-fi
-
 #######################################################################
 # And then it is as simple as that...