Unreviewed, rolling out r215608.