You're absolutely correct, and I fixed this specific path issue several versions ago (or thought I did). Need to figure out if my fix simply failed or if this is a regression, but spoofing the handshake is supposed to replace the Defeat Electronic Lock step entirely, not come after it.