Switching back to util-linux-2.22?