Unreviewed, rolling out r166876.