--- a/Context.st	Fri May 11 12:12:57 2018 +0100
+++ b/Context.st	Wed Jun 13 14:39:23 2018 +0000
@@ -1,5 +1,7 @@
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
+ COPYRIGHT (c) 2009-2011 Jan Vrany
+ COPYRIGHT (c) 2015-2017 Jan Vrany
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -26,6 +28,8 @@
 copyright
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
+ COPYRIGHT (c) 2009-2011 Jan Vrany
+ COPYRIGHT (c) 2015-2017 Jan Vrany
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -798,13 +802,6 @@
 	    __PATCHUPCONTEXT(theContext);
 	}
 	if (! __isNonLIFO(theContext)) {
-	    /*
-	     * to be prepared for the worst situation
-	     * (the sender is not stored, so the trap won't catch it)
-	     * make the writeBarrier trigger manually.
-	     * We'll see, if this is really required.
-	     */
-	    theContext->o_space |= CATCHMARK;
 	    __markNonLIFO(theContext);
 	}
     }
@@ -2308,19 +2305,6 @@
 	    if (__isLazy(theContext)) {
 		__PATCHUPCONTEXT(theContext);
 	    }
-
-	    if (! __isNonLIFO(theContext)) {
-		/*
-		 * to be prepared for the worst situation
-		 * (the sender is not stored, so the trap won't catch it)
-		 * make the writeBarrier trigger manually.
-		 * We'll see, if this is really required.
-		 */
-		theContext->o_space |= CATCHMARK;
-# if 0
-		__markNonLIFO(theContext);
-# endif
-	    }
 	    RETURN (theContext);
 	}
 	theContext = __ContextInstPtr(theContext)->c_sender;
@@ -2406,17 +2390,6 @@
 	    if (__isLazy(theContext)) {
 		__PATCHUPCONTEXT(theContext);
 	    }
-
-	    if (! __isNonLIFO(theContext)) {
-		/*
-		 * to be prepared for the worst situation
-		 * (the sender is not stored, so the trap won't catch it)
-		 * make the writeBarrier trigger manually.
-		 * We'll see, if this is really required.
-		 */
-		theContext->o_space |= CATCHMARK;
-		__markNonLIFO(theContext);
-	    }
 	    RETURN (theContext);
 	}
 	theContext = __ContextInstPtr(theContext)->c_sender;
@@ -2492,18 +2465,6 @@
 	    if (__isLazy(theContext)) {
 		__PATCHUPCONTEXT(theContext);
 	    }
-	    if (! __isNonLIFO(theContext)) {
-		/*
-		 * to be prepared for the worst situation
-		 * (the sender is not stored, so the trap won't catch it)
-		 * make the writeBarrier trigger manually.
-		 * We'll see, if this is really required.
-		 */
-		theContext->o_space |= CATCHMARK;
-# if 0
-		__markNonLIFO(theContext);
-# endif
-	    }
 	    RETURN (theContext);
 	}
 	theContext = __ContextInstPtr(theContext)->c_sender;
@@ -2575,19 +2536,6 @@
 	    if (__isLazy(theContext)) {
 		__PATCHUPCONTEXT(theContext);
 	    }
-
-	    if (! __isNonLIFO(theContext)) {
-		/*
-		 * to be prepared for the worst situation
-		 * (the sender is not stored, so the trap won't catch it)
-		 * make the writeBarrier trigger manually.
-		 * We'll see, if this is really required.
-		 */
-		theContext->o_space |= CATCHMARK;
-# if 0
-		__markNonLIFO(theContext);
-# endif
-	    }
 	    RETURN (theContext);
 	}
 	theContext = __ContextInstPtr(theContext)->c_sender;