Unreviewed, rolling out r111855.