Unreviewed, rolling out r198781.