Unreviewed, fix the internal build after r222596 and r222595.