Unreviewed, rolling out r111094.