Unreviewed, rolling out r218373.