The `@deprecated` decorator doesn't display when something will be removed, just when it was first deprecated.  If we want to change that, maybe we should just open another PR for discussion and fix all of our deprecations at once?