I am not sure how big of a task it would be to refactor these `remarshal` methods so that we do not perform the `tenantId == null` check for every metric (Splitting into 2 methods). But if does not make the code bloated, we should probably do it.