Unreviewed, rolling out r183600.