re-enable threadsafe