fix(perf): avoid creating unnecessary sets @W-17361878 (#4996)

fix(perf): avoid creating unnecessary sets @W-17361878 (#4996) #947