Unreviewed, rolling out r141905.