server: re-introduce the client/server versions