Backout bug1027266 reland