Issue #665 No sandbox preservation between unload/load

- Restores the intended behavior of not preserving state between
  unload/load.
- Avoids a race condition by removing the preserved state before
  load instead of during unload.