Reverted the POC hack for integrating Zipkin