util-linux(-ng): revert r31183, r31178 - the update introduced several regressions...