Backout 35d48d9d80d5 (bug 752982) for landing without proper review.