This isn't necessary any more as it's done in validate.