Unreviewed, rolling out r223691 and r223729.