Unreviewed, rolling out r219070.