fixes #2202 use habitat for env loading
Merge pull request #2225 from ScottDowne/habitat2

fixes #2202 use habitat for env loading