Unreviewed, rolling out r227211.