Revert "combined client and server only stuff"

This reverts commit 62a64498ee648a51ab6591ea1dec04a05c430d4a.