Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
+++ kernel/arch/amd64/src/debugger.c	(revision 687c3cd5921e1d47b5311bdcf4dfbc5f55ee093b)
@@ -65,6 +65,4 @@
 };
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
-
 static int cmd_del_breakpoint(cmd_arg_t *argv);
 static cmd_arg_t del_argv = {
@@ -102,5 +100,4 @@
 };
 
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 
@@ -321,5 +318,4 @@
 		printf("Cannot register command %s\n", bkpts_info.name);
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 	cmd_initialize(&delbkpt_info);
 	if (!cmd_register(&delbkpt_info))
@@ -333,5 +329,4 @@
 	if (!cmd_register(&addwatchp_info))
 		printf("Cannot register command %s\n", addwatchp_info.name);
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 	
@@ -378,6 +373,4 @@
 	return 1;
 }
-
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 
 /** Remove breakpoint from table */
@@ -413,5 +406,4 @@
 	return 1;
 }
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 
Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision 687c3cd5921e1d47b5311bdcf4dfbc5f55ee093b)
@@ -40,5 +40,4 @@
 #include <arch/context.h>	/* SP_DELTA */
 #include <arch/asm.h>
-#include <arch/debugger.h>
 #include <print.h>
 #include <arch/pm.h>
@@ -69,11 +68,4 @@
 	/* TLS support - set FS to thread local storage */
 	write_msr(AMD_MSR_FS, 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)
-		breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-		    BKPOINT_WRITE | BKPOINT_CHECK_ZERO, CPU->id);
-#endif
 }
 
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
 }