Revert "Lock state before we modify."

This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.

Change from #2795