diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index abd840e2..eeb5ebf6 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -94,16 +94,20 @@ EOF
 }
 
 beaglebone_flash() {
-    bbb_version=$1
     # allow flash-kernel to work without valid /proc contents
     # ** this doesn't *really* work, since there are too many checks
     #    that fail in an emulated environment!  We'll have to do it by
     #    hand below anyway...
-    if [[ "$bbb_version" == 'wireless' ]]; then
-        export FK_MACHINE="TI AM335x BeagleBone Black Wireless"
-    else
-        export FK_MACHINE="TI AM335x BeagleBone Black"
-    fi
+    export FK_MACHINE="TI AM335x BeagleBone Black"
+    apt-get install -y flash-kernel
+}
+
+beaglebone_flash_wireless() {
+    # allow flash-kernel to work without valid /proc contents
+    # ** this doesn't *really* work, since there are too many checks
+    #    that fail in an emulated environment!  We'll have to do it by
+    #    hand below anyway...
+    export FK_MACHINE="TI AM335x BeagleBone Black Wireless"
     apt-get install -y flash-kernel
 }
 
@@ -252,7 +256,7 @@ case "$MACHINE" in
         ;;
     beaglebonewifi)
         beaglebone_setup_boot wireless
-        beaglebone_flash wireless
+        beaglebone_flash_wireless
         beaglebone_repack_kernel wireless
         enable_serial_console ttyO0
         ;;