Unreviewed, rolling out r110951.