Unreviewed, rolling out r222380.