Backout changeset 89258d090059 for lacking review.