[telemetry] Removed too much in the previous commit because my upstream master was not up to date