Unreviewed, rolling out r114965.