Fix regression of Rev 37952c111f71. Rev 37952c111f71 led to wiping away every role given in a comma separated list after the first comma, which also broke the automatic tests.