Revert "Merge pull request #12221 from lightsofapollo/marionette-fix-state

This reverts commit 3f51f302c3a0c57d8bad482ec7ee86b2819389fb, reversing
changes made to 7596b8368097c3d5bd4c5fafd553dc6bfc2e3520.