Unreviewed, rolling out r142413.