Unreviewed, rolling out r112489.