Correct "Update code for new RPC interface behaviour + status codes."

This partly reverts commit 050d5b644e35cce349c7115c6c23a59cebe757b3.