Unreviewed, rolling out r137491.