Unreviewed, rolling out r103405.