Merge "Revert "Thread-safe metric producers.""