Switch to new WebServer integration