Can you please add the same deprecation comment before and after the class definition, so that we'll know we have to remove it?