Revert "Fix FTBS on newer pyro versions due to duplicate userids"