Moved a one-off to util.