Unreviewed, rolling out r105828.