Unreviewed, rolling out r109733.