Revert "Merge pull request #1 from vinayr/serverfix"

Reverts vinayr/test#2