Unreviewed, rolling out r109981.