Unreviewed, rolling out r124614.