Moved daemon options back into server.