Unreviewed, rolling out r226600 and r226603