revert to RPC based message class