Unreviewed, rolling out r183985.