As in the other code review: I don't think this should be here.