Unreviewed, rolling out r220288.