Revert "Fix rfc8040 rpcs not working"