Unreviewed, rolling out r143895.