[CHORE] Restore webserver code as it was before the refactor