Unreviewed, rolling out r254955.