Revert the changes here. #543 has removed the cherrypy dependency in VideoServer.py