Unreviewed, rolling out r197955.