Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision 687c3cd5921e1d47b5311bdcf4dfbc5f55ee093b)
@@ -39,5 +39,4 @@
 #include <arch.h>
 #include <arch/context.h>	/* SP_DELTA */
-#include <arch/debugger.h>
 #include <arch/pm.h>
 #include <arch/asm.h>
@@ -71,13 +70,4 @@
 	/* Set up TLS in GS register */
 	set_tls_desc(THREAD->arch.tls);
-
-#ifdef CONFIG_DEBUG_AS_WATCHPOINT
-	/* Set watchpoint on AS to ensure that nobody sets it to zero */
-	if (CPU->id < BKPOINTS_MAX) {
-		the_t *the = THE;
-		breakpoint_add(&((the_t *) the->thread->kstack)->as, 
-		    BKPOINT_WRITE | BKPOINT_CHECK_ZERO, the->cpu->id);
-	}
-#endif
 }