Unreviewed, rolling out r141809.