diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh
index b79b15167..dde62de65 100755
--- a/releasetools/arm_sdimage.sh
+++ b/releasetools/arm_sdimage.sh
@@ -87,10 +87,15 @@ cp ${RELEASETOOLSDIR}/u-boot/${U_BOOT_BIN_DIR}/u-boot.img ${IMG_DIR}/
 cp ${RELEASETOOLSDIR}/u-boot/${U_BOOT_BIN_DIR}/MLO ${IMG_DIR}/
 
 #
-# Call build.sh using a sloppy file list so we don't need to remove the installed /etc/fstag
+# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'.
+#
+rm -f ${FSTAB}
+
+#
+# Now start the build
 #
 export CPPFLAGS=${FLAG}
-sh ${BUILDSH} -V SLOPPY_FLIST=yes -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution
+sh ${BUILDSH} -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution
 
 #
 # This script creates a bootable image and should at some point in the future
diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh
index 4fb10a7a0..6ea488608 100755
--- a/releasetools/x86_hdimage.sh
+++ b/releasetools/x86_hdimage.sh
@@ -46,10 +46,15 @@ rm -rf $IMG_DIR $IMG
 mkdir -p $IMG_DIR $CDFILES
 
 #
-# Call build.sh using a sloppy file list so we don't need to remove the installed /etc/fstag
+# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'.
+#
+rm -f ${FSTAB}
+
+#
+# Now start the build.
 #
 export CPPFLAGS=${FLAG}
-sh ${BUILDSH} -V SLOPPY_FLIST=yes -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution
+sh ${BUILDSH} -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution
 
 if [ "$ISOMODE" ]
 then	cp ${DESTDIR}/usr/mdec/boot_monitor $CDFILES/boot