Don't de-deprecate until next release

This reverts commit aa0acc1f71dcb033e7c8cea0be4bfa411f1f5e71.