Issue #24759: Revert 8203fc75b3d2.
1 file changed