Drop thread_safe version, which was pulled