Revert "Committed some fixes to unbreak local server and client interaction."

This reverts commit bbdea301f80bacc197e36fba7a67099729f4d74d.