Reverted issue #24134 changes.
3 files changed