Unreviewed, rolling out r195742.