Comment should not be left in (if we go with this change).