Unreviewed, rolling out r251381.