Unreviewed, rolling out r220060.