Unreviewed, rolling out r126344.