Makes sense, but should we keep the comment around too?