revert 030e100f048a (#29006, #10513)
3 files changed