revert back a change broke rpc demo.
Merge branch 'master' of https://github.com/openlegacy/openlegacy.git