Unreviewed, rolling out r208382.