Should we make this a global flag instead of a per-command parameter?