Unreviewed, rolling out r109255.