Unreviewed, rolling out r161540.