Unreviewed, rolling out r108522.