diff --git a/build/lib/watch/index.js b/build/lib/watch/index.js
index <HASH>..<HASH> 100644
--- a/build/lib/watch/index.js
+++ b/build/lib/watch/index.js
@@ -19,14 +19,15 @@ function handleDeletions() {
 
 let watch = void 0;
 
-if (!process.env['VSCODE_USE_LEGACY_WATCH']) {
-	try {
-		watch = require('./watch-nsfw');
-	} catch (err) {
-		console.warn('Could not load our cross platform file watcher: ' + err.toString());
-		console.warn('Falling back to our platform specific watcher...');
-	}
-}
+// Disabled due to https://github.com/Microsoft/vscode/issues/36214
+// if (!process.env['VSCODE_USE_LEGACY_WATCH']) {
+// 	try {
+// 		watch = require('./watch-nsfw');
+// 	} catch (err) {
+// 		console.warn('Could not load our cross platform file watcher: ' + err.toString());
+// 		console.warn('Falling back to our platform specific watcher...');
+// 	}
+// }
 
 if (!watch) {
 	watch = process.platform === 'win32' ? require('./watch-win32') : require('gulp-watch');
Gulp watch fails to trigger recompilation while TypeScript compiles (fixes #<I>)