diff --git a/build/tfs/win32/lib.ps1 b/build/tfs/win32/lib.ps1
index c2e9c1d83ef..9dfaeabf7a6 100644
--- a/build/tfs/win32/lib.ps1
+++ b/build/tfs/win32/lib.ps1
@@ -3,13 +3,10 @@ $ErrorActionPreference = 'Stop'
 
 $env:HOME=$env:USERPROFILE
 
-if (Test-Path env:AGENT_WORKFOLDER) {
-	# will be used by node-gyp
-	$env:HOME = "${env:AGENT_WORKFOLDER}\home"
-	New-Item -Path "$env:HOME" -Type directory -Force | out-null
-
-	# will be used by npm
-	$env:npm_config_cache = "${env:AGENT_WORKFOLDER}\npm-cache"
+if (Test-Path env:AGENT_HOMEDIRECTORY) {
+	$env:USERPROFILE="${env:AGENT_HOMEDIRECTORY}"
+	$env:HOME="${env:AGENT_HOMEDIRECTORY}"
+	$env:npm_config_cache="${env:AGENT_HOMEDIRECTORY}/.npm-electron"
 	New-Item -Path "$env:npm_config_cache" -Type directory -Force | out-null
 }
 
diff --git a/scripts/env.ps1 b/scripts/env.ps1
index f05a5680644..afd26f17baa 100644
--- a/scripts/env.ps1
+++ b/scripts/env.ps1
@@ -1,5 +1,3 @@
 $env:npm_config_disturl="https://atom.io/download/electron"
 $env:npm_config_target=(node -p "require('./package.json').electronVersion")
-$env:npm_config_runtime="electron"
-$env:npm_config_cache="${env:USERPROFILE}/.npm-electron"
-New-Item -Path "$env:npm_config_cache" -Type directory -Force | out-null
\ No newline at end of file
+$env:npm_config_runtime="electron"
\ No newline at end of file