adopt RPCv3, remove hack