Issue #24485: Revert backwards compatibility breaking changes of #21217.
4 files changed