Revert "Fixes NPE on systems where $TMPDIR environment variable is not set"

This reverts commit 17f953dfcb3328c5ec87c0b27cb4a7f06ae82608.
Merge branch 'master' into feature/metric