Revert accidental change
util: Fix broken tests