Revert my changes in WebServer and XMLConverter