backout 9fcf4008b626 (#9179) for further consideration