Revert "FSM updates"

This reverts commit 2c3ce36ab27ef0dc24cbef2a40c47cc91e3db5f0.