Unreviewed, rolling out r236020.