Unreviewed, rolling out r128562.