Unreviewed, rolling out r242702.