LP#1977554: (follow-up) remove "switch" role