Revert "Struggling with server"

This reverts commit ac6a03dd53f19d084d56c78faff19311258f2030.