Revert "Lock state before we modify."

This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.
Merge pull request #2797 from crosbymichael/revert-exit-lock

Revert "Lock state before we modify."