backout 9fcf4008b626 (#9179) for further consideration
merge 3.4 (#9179)