Unreviewed, rolling out r111259.