Unreviewed, rolling out r235784.