Switched back to util-linux 2.21, disabled libblkid