This reverts commit 5571ef0d6d. It causes rolling upgrade failures. Fixes #9055. Reopens #8948.
5571ef0d6d