More generic solution to the blkid parse problem

References: 230f488ba1 and fa25d9f0e1