Unreviewed, rolling out r208837.