Unreviewed, rolling out r199660.