Unreviewed, rolling out r175806.