We ended up overriding and replacing with our own thread-safe version years ago when we also hit this.