Remove dependency on diagnostic library in service client-facing library