Make it purely about the Principal to Role mapping and skip any Role to Role mapping.