Unreviewed, rolling out r145097.