diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
index 076b32a089..91cb4c6da8 100644
--- a/dependencies/pip/dev_requirements.txt
+++ b/dependencies/pip/dev_requirements.txt
@@ -12,6 +12,10 @@
     # via -r dependencies/pip/requirements.in
 -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
     # via -r dependencies/pip/requirements.in
+-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   formpack
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
     # via -r dependencies/pip/requirements.in
 aiohttp==3.9.3
@@ -537,10 +541,6 @@ pytz==2024.1
     # via
     #   flower
     #   pandas
-pyxform==2.1.1
-    # via
-    #   -r dependencies/pip/requirements.in
-    #   formpack
 pyyaml==6.0.1
     # via responses
 redis==5.0.3
diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
index 8f179255ad..6074fbd6dd 100644
--- a/dependencies/pip/requirements.in
+++ b/dependencies/pip/requirements.in
@@ -16,6 +16,9 @@
 # using a fork for django > 1.1.0 compatibility
 -e git+https://github.com/trevoriancox/django-dont-vary-on.git@01a804122b7ddcdc22f50b40993f91c27b03bef6#egg=django-dont-vary-on
 
+# pyxform
+-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform
+
 # Regular PyPI packages
 Django>=4.2,<4.3
 Markdown
@@ -75,7 +78,6 @@ openpyxl
 psycopg
 pymongo
 python-dateutil
-pyxform==2.1.1
 requests
 regex
 responses
diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
index bcf2400265..83318025d0 100644
--- a/dependencies/pip/requirements.txt
+++ b/dependencies/pip/requirements.txt
@@ -12,6 +12,10 @@
     # via -r dependencies/pip/requirements.in
 -e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
     # via -r dependencies/pip/requirements.in
+-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform
+    # via
+    #   -r dependencies/pip/requirements.in
+    #   formpack
 -e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
     # via -r dependencies/pip/requirements.in
 aiohttp==3.9.3
@@ -412,10 +416,6 @@ pytz==2024.1
     # via
     #   flower
     #   pandas
-pyxform==2.1.1
-    # via
-    #   -r dependencies/pip/requirements.in
-    #   formpack
 pyyaml==6.0.1
     # via responses
 redis==5.0.3
diff --git a/jsapp/xlform/src/model.row.coffee b/jsapp/xlform/src/model.row.coffee
index 1829ea1ae1..8fefe705da 100644
--- a/jsapp/xlform/src/model.row.coffee
+++ b/jsapp/xlform/src/model.row.coffee
@@ -14,6 +14,7 @@ $skipLogicHelpers = require './mv.skipLogicHelpers'
 readParameters = require('../../js/components/formBuilder/formBuilderUtils').readParameters
 writeParameters = require('../../js/components/formBuilder/formBuilderUtils').writeParameters
 txtid = require('js/utils').txtid
+notify = require('js/utils').notify
 
 module.exports = do ->
   row = {}