diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index c12854eee3e6..509b046eca65 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -63,18 +63,6 @@ umount_loop() {
 }
 
 arm_create_disk() {
-	# XXX: This is potentially dangerous, but works around an issue
-	#      properly labeling md(4) devices when the label already
-	#      exists.
-	#      EVERYTHINGISFINE should *never* be set for non-RE use.
-	#      Trust me.  I'm an engineer.
-	if [ ! -z "${EVERYTHINGISFINE}" ]; then
-		for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
-			if [ -e "/dev/${_label}" ]; then
-				rm /dev/${_label}
-			fi
-		done
-	fi
 	# Create the target raw file and temporary work directory.
 	chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev}
 	chroot ${CHROOTDIR} gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}