Unreviewed, rolling out r143348.