Serverside executed client calls caused unwanted serialization.

Fixes #1669
Prevented more unwanted deserialization
Merge pull request #1911 from pveentjer/unwanted-client-serialization

Serverside executed client calls caused unwanted (de)serialization.