Unreviewed, rolling out r131189.