Closes https://github.com/hashicorp/vault/pull/7780 Changes to other parts of Vault have to come piece by piece, that's next.