diff --git a/mach/i386/libem/LIST b/mach/i386/libem/LIST
index 955e075d6..29dba7ef7 100644
--- a/mach/i386/libem/LIST
+++ b/mach/i386/libem/LIST
@@ -29,7 +29,6 @@ ngi.s
 nop.s
 print.s
 rck.s
-return.s
 rmi.s
 rmu.s
 rol.s
diff --git a/mach/i386/libem/error.s b/mach/i386/libem/error.s
index 36684efa3..f2501e152 100644
--- a/mach/i386/libem/error.s
+++ b/mach/i386/libem/error.s
@@ -8,13 +8,6 @@
 	! May only be called with error no's <16
 .sect .text
 .error:
-	push ebp
-	push esi
-	push edi
-	push edx
-	push ecx
-	push ebx
-	push eax
 	mov  ecx,eax
 	mov  ebx,1
 	sal  ebx,cl
@@ -24,19 +17,16 @@
 	jne  2f
 	call    .trp
 2:
-	pop  eax
-	pop  ebx
-	pop  ecx
-	pop  edx
-	pop  edi
-	pop  esi
-	pop  ebp
 	ret
 
 .Xtrp:
+	pusha
 	cmp	eax,16
 	jge	1f
 	call	.error
+	popa
 	ret
 1:
-	jmp	.trp
+	call	.trp
+	popa
+	ret