This should probably use the serviceManagementService, but I realize that's out of scope for the current PR.