Unreviewed, rolling out r157460.