Unreviewed, rolling out r224860.