diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CreateMultiDexMainDexClassList.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CreateMultiDexMainDexClassList.cs
index 1f85ef87150..06ea497a5c9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/CreateMultiDexMainDexClassList.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/CreateMultiDexMainDexClassList.cs
@@ -51,7 +51,8 @@ public override bool Execute ()
 			EnvironmentVariables =
 				string.IsNullOrEmpty (MSBuildRuntimeType) || MSBuildRuntimeType == "Mono" ?
 				new string [] { "PROGUARD_HOME=" + ProguardHome } :
-				new string [] { "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8", "PROGUARD_HOME=" + ProguardHome };
+				//TODO ReAdd the PROGUARD_HOME env variable once we are shipping our own proguard
+				new string [] { "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8" };
 
 			return base.Execute ();
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Proguard.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Proguard.cs
index 28539bfaf5c..e0f7942a7cb 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/Proguard.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/Proguard.cs
@@ -111,7 +111,8 @@ public override bool Execute ()
 			EnvironmentVariables =
 				string.IsNullOrEmpty (MSBuildRuntimeType) || MSBuildRuntimeType == "Mono" ?
 				new string [] { "PROGUARD_HOME=" + ProguardHome } :
-				new string [] { "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8", "PROGUARD_HOME=" + ProguardHome };
+				//TODO ReAdd the PROGUARD_HOME env variable once we are shipping our own proguard
+				new string [] { "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8" };
 
 			return base.Execute ();
 		}