This can probably default on? Otherwise perhaps allow a env var to to enable it globally.