Unreviewed, rolling out r97954.