diff --git a/sys/arch/mips/include/locore.h b/sys/arch/mips/include/locore.h
index 5e1dea01ea73..b0cdb627afba 100644
--- a/sys/arch/mips/include/locore.h
+++ b/sys/arch/mips/include/locore.h
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.47 2000/10/05 00:52:59 cgd Exp $ */
+/* $NetBSD: locore.h,v 1.48 2000/10/05 01:06:06 cgd Exp $ */
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -94,7 +94,6 @@ u_int32_t mips3_write_count(u_int32_t);
 u_int32_t mips3_read_compare(void);
 void	mips3_write_config(u_int32_t);
 void	mips3_write_compare(u_int32_t);
-void	mips3_clearBEV(void);
 
 u_int64_t mips3_ld(u_int64_t *);
 void	mips3_sd(u_int64_t *, u_int64_t);
diff --git a/sys/arch/mips/mips/locore_mips3.S b/sys/arch/mips/mips/locore_mips3.S
index 3b81c7f108b9..6046ebd52a3a 100644
--- a/sys/arch/mips/mips/locore_mips3.S
+++ b/sys/arch/mips/mips/locore_mips3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_mips3.S,v 1.55 2000/10/02 22:13:38 cgd Exp $	*/
+/*	$NetBSD: locore_mips3.S,v 1.56 2000/10/05 01:06:06 cgd Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -2467,18 +2467,6 @@ LEAF(mips3_write_compare)
 	nop
 END(mips3_write_compare)
 
-/*
- * Clear BEV bit if it was set.
- */
-LEAF(mips3_clearBEV)
-	mfc0	v0, MIPS_COP_0_STATUS
-	or	v0, MIPS3_SR_DIAG_BEV
-	xor	v0, MIPS3_SR_DIAG_BEV
-	mtc0	v0, MIPS_COP_0_STATUS
-	j	ra
-	nop
-	END(mips3_clearBEV)
-
 LEAF(mips3_FetchIcache)
 	lw	t1, mips_L1ICacheSize
 	lw	t2, mips_L1ICacheLSize
diff --git a/sys/arch/mips/mips/mips_machdep.c b/sys/arch/mips/mips/mips_machdep.c
index 2e82b70dee63..e3b912894656 100644
--- a/sys/arch/mips/mips/mips_machdep.c
+++ b/sys/arch/mips/mips/mips_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_machdep.c,v 1.105 2000/10/05 00:53:01 cgd Exp $	*/
+/*	$NetBSD: mips_machdep.c,v 1.106 2000/10/05 01:06:07 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.105 2000/10/05 00:53:01 cgd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.106 2000/10/05 01:06:07 cgd Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
@@ -310,7 +310,8 @@ mips3_vector_init(mips3_csizebase)
 
 	MachFlushCache();
 
-	mips3_clearBEV();
+	/* Clear BEV in SR so we start handling our own exceptions */
+	mips_cp0_status_write(mips_cp0_status_read() & ~MIPS3_SR_DIAG_BEV);
 }
 #endif	/* MIPS3 */