backout 4e6fcc7b5d13, 58d9759ff3d1, and 45d37d92612d CLOSED TREE