Unreviewed, rolling out r94510.