Dang it, we forgot to do this for 9.11 and then forgot again for 9.12.

Is it too late to put in a deprecated-usage warning in 9.12?  And be sure
to finish this in 9.13.