I'd like to remove the code in the validator that adds the authority. IMHO that's not validation.