backout fac649bf2d10 (#9179) for further consideration
merge 2.7.9 release branch