[all] CB-2641 - Use modulemapper to retrieve the original symbol