Unreviewed, rolling out r245401.