Backout 9861229c1b15 for test. CLOSED TREE