Unreviewed, rolling out r231223 and r231288.