Unreviewed, rolling out r229689.