Unreviewed, rolling out r129521.