Can we throw a deprecated warning here?  Feels like we should.

Same where similar code exists