Revert "Merge branch 'master' of https://github.com/regneq/Server-1"

This reverts commit 8df70bf9fc39a17390460939268ea5b0639c8457, reversing
changes made to 2cd45c73125829f086c5325b36835ef39fa02153.