Partially revert "Adjust for RPCService methods changing"