Unreviewed, rolling out r220268.