initial steps to re-enable env support