Unreviewed, rolling out r108851.