Revert "Merge branch 'master' of github.com:ipeirotis/Troia-Server"

This reverts commit 8f1cd4ef91217a5c542f15b64f0f115f35fac859, reversing
changes made to 7af0a287edffb3d437b54ac03775b3e1b513aaf2.