Deprecate some things

This is a counter point to #485 for 2.99. It deprecates the APIs I removed there.