Unreviewed, rolling out r226937.