Remove some magic from the RPC Backend API

Change-Id: Iccf83e2231c18036263e4a0b6183f75405ef247b