Unreviewed, rolling out r246501.