Unreviewed, rolling out r183687.