Unreviewed, rolling out r108860.