revert dd13098a5dc2 (#29006, #10513)
3 files changed