Unreviewed, rolling out r246524.