Remove SaveStateMode. Fixes #2340
Merge pull request #2404 from danzel/fix-2340

Remove SaveStateMode