[issue19152] Revert 832579dbafd6.
5 files changed