BUG 3566 : Get remote-rpc working again