diff --git a/app/build.gradle b/app/build.gradle
index 8363a55d5aa0..36d1c8bd0e42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -554,7 +554,7 @@ ext {
     // Enable expiration by major version.
     gleanExpireByVersion = Config.majorVersion(project)
     gleanNamespace = "mozilla.telemetry.glean"
-    gleanPythonEnvDir = gradle.mozconfig.substs.GRADLE_GLEAN_PARSER_VENV
+    // gleanPythonEnvDir = gradle.mozconfig.substs.GRADLE_GLEAN_PARSER_VENV
 }
 apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
 apply plugin: "org.mozilla.appservices.nimbus-gradle-plugin"
diff --git a/automation/iceraven/patch_android_components.sh b/automation/iceraven/patch_android_components.sh
index 28038087dd00..76cbe50f356d 100755
--- a/automation/iceraven/patch_android_components.sh
+++ b/automation/iceraven/patch_android_components.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+shopt -s globstar
+
 cp automation/iceraven/assets/*.xml android-components/components/feature/search/src/main/assets/searchplugins
 cp -f automation/iceraven/assets/list.json android-components/components/feature/search/src/main/assets/search
 
@@ -9,5 +11,7 @@ do
   sed -i "41i\    \"$engine\"," android-components/components/feature/search/src/main/java/mozilla/components/feature/search/storage/SearchEngineReader.kt
 done
 
+sed -i "s#gleanPythonEnvDir#// gleanPythonEnvDir#g" android-components/**/*.gradle
+
 git -C android-components apply < automation/iceraven/patches/top_sites_no_most_visted_sites.patch
 git -C android-components apply < automation/iceraven/patches/suggestions_increase_number.patch
\ No newline at end of file