I do prefer to deal with it in a follow-up bug.