diff --git a/.vscode/launch.template.json b/.vscode/launch.template.json
index ca3ac8d2b8843..e4301b81e87b9 100644
--- a/.vscode/launch.template.json
+++ b/.vscode/launch.template.json
@@ -48,11 +48,7 @@
       "outFiles": [
         "${workspaceRoot}/built/local/run.js"
       ],
-
-      // NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
-      // here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
-      // this feature is shipping in insiders or to a release:
-      // "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
+      "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
     },
     {
       // See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
@@ -60,11 +56,7 @@
       "request": "attach",
       "name": "Attach to VS Code TS Server via Port",
       "processId": "${command:PickProcess}",
-
-      // NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
-      // here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
-      // this feature is shipping in insiders or to a release:
-      // "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
+      "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
     }
   ]
 }
diff --git a/.vscode/settings.template.json b/.vscode/settings.template.json
index 1806a93ecbc65..3359472330b2e 100644
--- a/.vscode/settings.template.json
+++ b/.vscode/settings.template.json
@@ -2,10 +2,7 @@
 // contents into your existing settings.
 {
     "eslint.validate": [
-        {
-            "language": "typescript",
-            "autoFix": true
-        }
+        "typescript"
     ],
     "eslint.options": {
         "rulePaths": ["./scripts/eslint/built/rules/"],
@@ -16,4 +13,4 @@
 
     // To use the locally built compiler, after 'npm run build':
     // "typescript.tsdk": "built/local"
-}
\ No newline at end of file
+}