rolling out env fix again