Created a branch for client server code contribution. Reverting master to
existing R.NET before merge, pending further merge/work

This reverts commit 1894d917c05f874d03b160d9e213315ab8d3354d, reversing
changes made to 474501da67dcb1e4447f2e923c0467189633aa8e.