Unreviewed, rolling out r235976.