Unreviewed, rolling out r160945.