Unreviewed, rolling out r112201.