Maybe we should have only one conditional and put everything under it, instead of two based on the env vars, wdyt?