Unreviewed, rolling out r219030.