Do we need to keep the comment around still?