Unreviewed, rolling out r163530.