Whenever we bump deprecations, like in #6138, we still need to manually edit all the functions to swap out soft-deprecations for full deprecations and swap out full deprecations for defunct declarations. This is a bit of of an annoyance to do and we might be happier in the long term if we manage this is a more systematic way.