Revert RPC client changes