Unreviewed, rolling out r109014.