Unreviewed, rolling out r239524.