Reverted Zach's "Improvements"

It should always state that it was deprecated, even when Zach removes
the deprecation again.