Can we get rid of this comment?