[PM/AA] Switch to an early-exit. NFC. This was split out of another