adapt to the servant/servant-server split