Backed out changeset 1395d2a59698 (bug 879668) for landing without review.