Unreviewed, rolling out r128409.