diff --git a/package.json b/package.json
index 1122a2becd7..ccef37bdb3e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.39.0",
-  "distro": "13ad3edfae7fc8e54c16b95b7ed4f5b6e41571ab",
+  "distro": "b95ba5874a1c13644a3fcc82fa6c0b82f290215c",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/platform/dialogs/electron-main/dialogs.ts b/src/vs/platform/dialogs/electron-main/dialogs.ts
index 84430fe2820..7b49ca50c2e 100644
--- a/src/vs/platform/dialogs/electron-main/dialogs.ts
+++ b/src/vs/platform/dialogs/electron-main/dialogs.ts
@@ -8,7 +8,7 @@ import { MessageBoxOptions, MessageBoxReturnValue, SaveDialogOptions, SaveDialog
 import { Queue } from 'vs/base/common/async';
 import { IStateService } from 'vs/platform/state/node/state';
 import { isMacintosh } from 'vs/base/common/platform';
-import { dirname } from 'path';
+import { dirname } from 'vs/base/common/path';
 import { normalizeNFC } from 'vs/base/common/normalization';
 import { exists } from 'vs/base/node/pfs';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/node/dialogs';
diff --git a/tslint.json b/tslint.json
index e894c1faabf..31adda1904b 100644
--- a/tslint.json
+++ b/tslint.json
@@ -93,7 +93,7 @@
 				"restrictions": [
 					"vs/nls",
 					"**/vs/base/{common,browser,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -129,7 +129,7 @@
 					"vs/nls",
 					"**/vs/base/{common,browser,node}/**",
 					"**/vs/base/parts/*/{common,browser,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -139,7 +139,7 @@
 					"vs/css!./**/*",
 					"**/vs/base/{common,browser,node,electron-browser}/**",
 					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -148,7 +148,7 @@
 					"vs/nls",
 					"**/vs/base/{common,browser,node,electron-main}/**",
 					"**/vs/base/parts/*/{common,browser,node,electron-main}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -188,7 +188,7 @@
 					"**/vs/base/{common,browser,node}/**",
 					"**/vs/base/parts/*/{common,browser,node}/**",
 					"**/vs/platform/*/{common,browser,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -199,7 +199,7 @@
 					"**/vs/base/{common,browser,node}/**",
 					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
 					"**/vs/platform/*/{common,browser,node,electron-browser}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -209,7 +209,7 @@
 					"**/vs/base/{common,browser,node}/**",
 					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
 					"**/vs/platform/*/{common,browser,node,electron-main}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -414,7 +414,7 @@
 					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
 					"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
 					"**/vs/workbench/services/*/{common,browser,node,electron-browser}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -429,7 +429,7 @@
 					"vs/workbench/contrib/files/common/editors/fileEditorInput",
 					"**/vs/workbench/services/**",
 					"**/vs/workbench/test/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -486,7 +486,7 @@
 					"**/vs/workbench/{common,node}/**",
 					"**/vs/workbench/api/{common,node}/**",
 					"**/vs/workbench/services/**/{common,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -499,7 +499,7 @@
 					"**/vs/editor/**",
 					"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
 					"**/vs/workbench/services/**/{common,browser,node,electron-browser}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -564,7 +564,7 @@
 					"**/vs/base/parts/**/{common,browser,node}/**",
 					"**/vs/platform/**/{common,browser,node}/**",
 					"**/vs/code/**/{common,browser,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -576,7 +576,7 @@
 					"**/vs/base/parts/**/{common,browser,node,electron-browser}/**",
 					"**/vs/platform/**/{common,browser,node,electron-browser}/**",
 					"**/vs/code/**/{common,browser,node,electron-browser}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -587,7 +587,7 @@
 					"**/vs/base/parts/**/{common,browser,node,electron-main}/**",
 					"**/vs/platform/**/{common,browser,node,electron-main}/**",
 					"**/vs/code/**/{common,browser,node,electron-main}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{
@@ -600,7 +600,7 @@
 					"**/vs/workbench/**/{common,node}/**",
 					"**/vs/server/**",
 					"**/vs/code/**/{common,node}/**",
-					"*" // node modules
+					"!path" // node modules (except path where we have our own impl)
 				]
 			},
 			{