Correctly handle state loads and resets that were broken in 0.154 update.  Fixes #262.