Unreviewed, rolling out r219194.