diff --git a/src/Experimental.h b/src/Experimental.h
index 636d738cc..10c7ebb0b 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -36,7 +36,7 @@
 
 // LLL, 09 Nov 2013:
 // Allow all WASAPI devices, not just loopback
-#define EXPERIMENTAL_FULL_WASAPI
+// Not in for Audacity 2.0.6:   #define EXPERIMENTAL_FULL_WASAPI
 
 // JKC (effect by Norm C, 02 Oct 2013)
 //#define EXPERIMENTAL_SCIENCE_FILTERS
diff --git a/win/Projects/portaudio-v19/portaudio-v19.vcproj b/win/Projects/portaudio-v19/portaudio-v19.vcproj
index 627eee974..b02d9e4cb 100644
--- a/win/Projects/portaudio-v19/portaudio-v19.vcproj
+++ b/win/Projects/portaudio-v19/portaudio-v19.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="echo on&#x0D;&#x0A;set CFG=&quot;$(ProjectDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;echo // Automatically generated file &gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_DS 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_ASIO 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_DYNAMIC_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WDMKS 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WASAPI 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WMME 1 &gt;&gt;%CFG%&#x0D;&#x0A;"
+				CommandLine="echo on&#x0D;&#x0A;set CFG=&quot;$(ProjectDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;echo // Automatically generated file &gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_DS 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_ASIO 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_DYNAMIC_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;rem echo #define PA_USE_WDMKS 1 &gt;&gt;%CFG%&#x0D;&#x0A;rem echo #define PA_USE_WASAPI 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WMME 1 &gt;&gt;%CFG%&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -92,7 +92,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="echo on&#x0D;&#x0A;set CFG=&quot;$(ProjectDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;echo // Automatically generated file &gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_DS 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_ASIO 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_DYNAMIC_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WDMKS 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WASAPI 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WMME 1 &gt;&gt;%CFG%&#x0D;&#x0A;"
+				CommandLine="echo on&#x0D;&#x0A;set CFG=&quot;$(ProjectDir)/$(ConfigurationName)/config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;echo // Automatically generated file &gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%DXSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_DS 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%ASIOSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_ASIO 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_USE_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;IF NOT &quot;%JACKSDK_DIR%&quot; == &quot;&quot; echo #define PA_DYNAMIC_JACK 1 &gt;&gt;%CFG%&#x0D;&#x0A;rem echo #define PA_USE_WDMKS 1 &gt;&gt;%CFG%&#x0D;&#x0A;rem echo #define PA_USE_WASAPI 1 &gt;&gt;%CFG%&#x0D;&#x0A;echo #define PA_USE_WMME 1 &gt;&gt;%CFG%&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"