Revert "More threadsafeness." It does not seem to be necessary and could potentially
cause trouble of its own.

This reverts commit d9ef38b5affbb7af13d865c1e2da06e55f857d9f.