Unreviewed, rolling out r222791 and r222873.