Unreviewed, rolling out r244627.