Remove _serviceId workaround

Closes #3355495

Merge request reports

Loading