Thread Safety Issue with new hsearch-federated package.

Roll back