Back out a669a3d25d38 for breaking everything on this CLOSED TREE