Unreviewed, rolling out r123606.