WIP: Fix rebase error where env var support was removed