revert change from 0.6.0 that caused a race condition and crash with self._snapshot in utils