Merge "Don't use swift roles when no swift"