diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index d2f6c4a0f..a19a6cfdb 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -48,7 +48,7 @@ if test "$ZEN_RELEASE"; then
         export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64-v3 -C target-feature=+sse4.1 -C target-feature=+avx2 -C codegen-units=1 -Clink-args=--icf=safe"
     fi
     export VERBOSE=1
-    export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+    #export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 fi
 
 ac_add_options --target=x86_64-pc-linux
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index c6ee2ef21..852d9c4b9 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -36,4 +36,4 @@ else
     export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1"
 fi
 export VERBOSE=1
-export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+#export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 3101401b0..e7216659a 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -49,7 +49,7 @@ else
   export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
   export RUSTFLAGS="-Clink-args=--icf=safe -C target-feature=+avx2 -C codegen-units=1 -Ctarget-cpu=x86-64-v3"    
 fi
-export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+#export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 export VERBOSE=1
 
 if test "$ZEN_CROSS_COMPILING"; then
diff --git a/src/testing/profiles/profileserver/user-js.patch b/src/testing/profiles/profileserver/user-js.patch
new file mode 100644
index 000000000..6fe1bd57a
--- /dev/null
+++ b/src/testing/profiles/profileserver/user-js.patch
@@ -0,0 +1,13 @@
+diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
+index 19ff7d474f6d22d2d386764e2e6942ce6a324470..3cec3a25acc6f8780d56d273995974a905b6c031 100644
+--- a/testing/profiles/profileserver/user.js
++++ b/testing/profiles/profileserver/user.js
+@@ -8,3 +8,7 @@
+ user_pref("dom.timeout.enable_budget_timer_throttling", false);
+ // Turn off update
+ user_pref("app.update.disabledForTesting", true);
++
++// zen:
++// Disable workspaces in order to prevent SQL calls
++user_pref("zen.workspaces.enabled", false);
+\ No newline at end of file