Unreviewed, rolling out r102761.