temp-patch: actually, don't rely on straight file umount ever succeeding