backout #19081 to fix #20621
3 files changed