Unreviewed, rolling out r105906.