Unreviewed, rolling out r135819.