Backout a17bb92b2d52 for bustage, CLOSED TREE.