Unreviewed, rolling out r123715.