Ping, I think we should keep the warning and work towards making it easy to migrate away. This worked well for Ring-1, and we should do the same for upstream.