rpc_handler were gone when we needed it