Unreviewed, rolling out r129086.