Unreviewed, rolling out r126169.