Unreviewed, rolling out r177037.