Revert "Jaros fixes to the StateMap"

This reverts commit f75250b4c97374789cc46a9a143aa280589d5a7c.