Unreviewed, rolling out r249721.