MBS-6693: PUID support in /ws/{1,2} should act as if there are no PUIDS