This suffers from the same issue as your other PR. Unfortunately, setting on the global handler will cause issues in parallel environments.  We need to find a way to scope to a single HTTP server.