Bug 916045 - remove default cli options from talos.json. r=armenzg
Backout bug 817700 for causing various regressions. r=me