diff --git a/gateworks-newport.sh b/gateworks-newport.sh
index ed7c35f..b14b50f 100755
--- a/gateworks-newport.sh
+++ b/gateworks-newport.sh
@@ -121,9 +121,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/gateworks-ventana.sh b/gateworks-ventana.sh
index 819491b..539cf2e 100755
--- a/gateworks-ventana.sh
+++ b/gateworks-ventana.sh
@@ -133,9 +133,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/pinebook-pro.sh b/pinebook-pro.sh
index cef30a3..7be6266 100755
--- a/pinebook-pro.sh
+++ b/pinebook-pro.sh
@@ -107,9 +107,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/pinebook.sh b/pinebook.sh
index 6fc77f1..149332b 100755
--- a/pinebook.sh
+++ b/pinebook.sh
@@ -112,9 +112,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi-zero-2-w-pitail.sh b/raspberry-pi-zero-2-w-pitail.sh
index 90a81ed..4bbb9f7 100755
--- a/raspberry-pi-zero-2-w-pitail.sh
+++ b/raspberry-pi-zero-2-w-pitail.sh
@@ -208,9 +208,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi-zero-2-w.sh b/raspberry-pi-zero-2-w.sh
index 76169fa..9c19036 100755
--- a/raspberry-pi-zero-2-w.sh
+++ b/raspberry-pi-zero-2-w.sh
@@ -82,9 +82,8 @@ include rpi_firmware
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi-zero-w-pitail.sh b/raspberry-pi-zero-w-pitail.sh
index 8934da2..8de48d0 100755
--- a/raspberry-pi-zero-w-pitail.sh
+++ b/raspberry-pi-zero-w-pitail.sh
@@ -208,9 +208,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi-zero-w.sh b/raspberry-pi-zero-w.sh
index b947216..17cf2d3 100755
--- a/raspberry-pi-zero-w.sh
+++ b/raspberry-pi-zero-w.sh
@@ -82,9 +82,8 @@ include rpi_firmware
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi.sh b/raspberry-pi.sh
index c754403..0ba0204 100755
--- a/raspberry-pi.sh
+++ b/raspberry-pi.sh
@@ -81,9 +81,8 @@ include rpi_firmware
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/raspberry-pi1.sh b/raspberry-pi1.sh
index 09b3b1a..a768e83 100755
--- a/raspberry-pi1.sh
+++ b/raspberry-pi1.sh
@@ -82,9 +82,8 @@ include rpi_firmware
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root/
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi
diff --git a/usb-armory-mkii.sh b/usb-armory-mkii.sh
index ef25fb2..5f5a059 100755
--- a/usb-armory-mkii.sh
+++ b/usb-armory-mkii.sh
@@ -156,9 +156,8 @@ make_fstab
 # Create the dirs for the partitions and mount them
 status "Create the dirs for the partitions and mount them"
 mkdir -p "${base_dir}"/root
-# Test only
 if [[ $fstype == ext4 ]]; then
-mount -t ext4 -o noatime,data=writeback,barrier=0,nobh "${rootp}" "${base_dir}"/root
+mount -t ext4 -o noatime,data=writeback,barrier=0 "${rootp}" "${base_dir}"/root
 else
 mount "${rootp}" "${base_dir}"/root
 fi