Redo how restart works. Update Travis config.