We probably want a line in UPGRADING to inform people that we will no longer raise this exact exception.