diff --git a/src/Main/Base/Project/Src/Util/ExtensionMethods.cs b/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
index 8ca57530aa..5de5e87388 100644
--- a/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
+++ b/src/Main/Base/Project/Src/Util/ExtensionMethods.cs
@@ -29,13 +29,6 @@ namespace ICSharpCode.SharpDevelop
 	/// </summary>
 	public static class ExtensionMethods
 	{
-		// TODO: Remove this method in .NET 4.0 Beta 2
-		public static void ThrowIfCancellationRequested(this CancellationToken ct)
-		{
-			if (ct.IsCancellationRequested)
-				throw new OperationCanceledException("The operation was canceled.", ct);
-		}
-		
 		/// <summary>
 		/// Raises the event.
 		/// Does nothing if eventHandler is null.
diff --git a/src/Main/StartUp/Project/app.template.config b/src/Main/StartUp/Project/app.template.config
index 0b1aab563c..e106ad9d63 100644
--- a/src/Main/StartUp/Project/app.template.config
+++ b/src/Main/StartUp/Project/app.template.config
@@ -3,6 +3,10 @@
 		<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
 	</configSections>
 	
+	<startup useLegacyV2RuntimeActivationPolicy="true">
+		<supportedRuntime version="v4.0"/>
+	</startup>
+	
 	<runtime>
 		<!--
 			
diff --git a/src/Tools/NUnit/nunit-console-x86.exe.config b/src/Tools/NUnit/nunit-console-x86.exe.config
index 5c4cb25579..c19b40b464 100644
--- a/src/Tools/NUnit/nunit-console-x86.exe.config
+++ b/src/Tools/NUnit/nunit-console-x86.exe.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-		<requiredRuntime version="v4.0.20506" />
+		<requiredRuntime version="v4.0" />
 	</startup>
 	
 	<!--
diff --git a/src/Tools/NUnit/nunit-console.exe.config b/src/Tools/NUnit/nunit-console.exe.config
index 5c4cb25579..c19b40b464 100644
--- a/src/Tools/NUnit/nunit-console.exe.config
+++ b/src/Tools/NUnit/nunit-console.exe.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-		<requiredRuntime version="v4.0.20506" />
+		<requiredRuntime version="v4.0" />
 	</startup>
 	
 	<!--