diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index b1db5629754..961d32fa5e7 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.8 1994/08/03 02:45:30 davidg Exp $
+ *	$Id: swtch.s,v 1.9 1994/08/06 09:17:44 davidg Exp $
  */
 
 #include "npx.h"	/* for NNPX */
@@ -387,9 +387,6 @@ ENTRY(savectx)
 1:
 #endif	/* NNPX > 0 */
 
-	movl	_CMAP2,%edx			/* save temporary map PTE */
-	movl	%edx,PCB_CMAP2(%ecx)		/* in our context */
-
 	cmpl	$0,8(%esp)
 	je	1f
 	movl	%esp,%edx			/* relocate current sp relative to pcb */
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index b1db5629754..961d32fa5e7 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.8 1994/08/03 02:45:30 davidg Exp $
+ *	$Id: swtch.s,v 1.9 1994/08/06 09:17:44 davidg Exp $
  */
 
 #include "npx.h"	/* for NNPX */
@@ -387,9 +387,6 @@ ENTRY(savectx)
 1:
 #endif	/* NNPX > 0 */
 
-	movl	_CMAP2,%edx			/* save temporary map PTE */
-	movl	%edx,PCB_CMAP2(%ecx)		/* in our context */
-
 	cmpl	$0,8(%esp)
 	je	1f
 	movl	%esp,%edx			/* relocate current sp relative to pcb */
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index b1db5629754..961d32fa5e7 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.8 1994/08/03 02:45:30 davidg Exp $
+ *	$Id: swtch.s,v 1.9 1994/08/06 09:17:44 davidg Exp $
  */
 
 #include "npx.h"	/* for NNPX */
@@ -387,9 +387,6 @@ ENTRY(savectx)
 1:
 #endif	/* NNPX > 0 */
 
-	movl	_CMAP2,%edx			/* save temporary map PTE */
-	movl	%edx,PCB_CMAP2(%ecx)		/* in our context */
-
 	cmpl	$0,8(%esp)
 	je	1f
 	movl	%esp,%edx			/* relocate current sp relative to pcb */