Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 89b6a3bee8770a7ec407637aafd09a52976a5fb2)
+++ kernel/generic/include/ddi/irq.h	(revision 69114714b32f8575a7def8ac202a1d78e12f43f1)
@@ -134,6 +134,4 @@
 	/** Notification configuration structure. */
 	ipc_notif_cfg_t notif_cfg; 
-	
-	as_t *driver_as;
 } irq_t;
 
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 89b6a3bee8770a7ec407637aafd09a52976a5fb2)
+++ kernel/generic/src/ipc/irq.c	(revision 69114714b32f8575a7def8ac202a1d78e12f43f1)
@@ -174,5 +174,4 @@
 	irq->notif_cfg.code = code;
 	irq->notif_cfg.counter = 0;
-	irq->driver_as = AS;
 	
 	/*
@@ -364,8 +363,4 @@
 	if (!code)
 		return IRQ_DECLINE;
-	
-	as_t *current_as = AS;
-	if (current_as != irq->driver_as)
-		as_switch(AS, irq->driver_as);
 	
 	for (size_t i = 0; i < code->cmdcount; i++) {
@@ -455,7 +450,4 @@
 	}
 	
-	if (AS != current_as)
-		as_switch(AS, current_as);
-	
 	return IRQ_DECLINE;
 }