Revert "rework SAE state machine 2/2"

This reverts commit 245ee25c0e6546c2984f4166b4535a07ca4ba2a6.

Remove this for now until I get a chance to debug
Revert "rework SAE state machine (1/2)"

This reverts commit b70a2ba227e10bbe50c380417f0f4be2fa4056a3.

Remove for now until I get a chance to debug
fixup auth sae - confirm without commit