This should allow folks that build in non-thread-safe environments to
still be able to build the library.

Fixes: #5663