Unreviewed, rolling out r233347.