It turns out that you shouldn't assume that this environment variable has been defined.  Are you accepting reviews on this PR or should I take it over?