Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 0a2c96cfcc52e23d30070e2ab96f8248af56fe93)
+++ kernel/generic/src/udebug/udebug.c	(revision 89ba88c9450661ceee63cfe6f84a5d96f9ec0f4f)
@@ -479,10 +479,8 @@
 	mutex_unlock(&THREAD->udebug.lock);
 
-	/* Make sure the debugging session is over before proceeding. */
-	mutex_lock(&THREAD->udebug.lock);
-	while (THREAD->udebug.active)
-		condvar_wait(&THREAD->udebug.active_cv, &THREAD->udebug.lock);
-	mutex_unlock(&THREAD->udebug.lock);
-
+	/*
+	 * This is where we will typically block until a post-mortem debugger
+	 * terminates the debugging session.
+	 */
 	udebug_stoppable_end();
 }