Revert to Server.cpp from master