Backout bug1026792 reland