Unreviewed, rolling out r198856.