Unreviewed, rolling out r231468.