Unreviewed, rolling out r233112.