Unreviewed, rolling out r174275.