Unreviewed, rolling out r109837.