Unreviewed, rolling out r242071.