Unreviewed, rolling out r137328.