Unreviewed, rolling out r221461.