Unreviewed, rolling out r202413.