Removed confusion with apic_system_id from two contexts