#20311: revert changes to 3.3 branch for now until experts have decided how to resolve the issue.
3 files changed