Unreviewed, rolling out r248942.