Unreviewed, rolling out r103169.