Do we want to try getting this in the upstream telemetry-server code?  If so, perhaps we should put it in its own commit…