Unreviewed attempt to fix Win Cairo build after r233310.