Unreviewed, rolling out r236647.