Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.542.2.17 -r1.542.2.18
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2019 15:07:38 -0000	1.542.2.17
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2019 18:03:21 -0000	1.542.2.18
@@ -625,14 +625,6 @@
   Page instproc marshall {{-mode export}} {
     :unset_temporary_instance_variables
 
-    # Since ORM reform circa 2019-03-05, ORM will persist the
-    # context_id it receives. The safest approach to keep the old
-    # behavior of ignoring it at import time, is that we get rid of it
-    # at export time. For most practical purposes in xowiki,
-    # context_id = parent_id anyway.
-    set old_context_id ${:context_id}
-    unset :context_id
-
     set old_creation_user  [:creation_user]
     set old_modifying_user ${:modifying_user}
     set :creation_user   [:map_party -property creation_user $old_creation_user]
@@ -656,7 +648,6 @@
     }
     set :creation_user  $old_creation_user
     set :modifying_user $old_modifying_user
-    set :context_id     $old_context_id
 
     return $content
   }
@@ -968,6 +959,10 @@
 
   Page instproc demarshall {-parent_id -package_id -creation_user {-create_user_ids 0}} {
     # this method is the counterpart of marshall
+    # Unset the context_id, which would otherwise come from the
+    # original object and persisted. By default, will be set to the
+    # new object's parent_id
+    unset :context_id
     set :parent_id $parent_id
     set :package_id $package_id
     :reverse_map_party_attribute -attribute creation_user  \