diff --git a/repos/base/include/irq_session/connection.h b/repos/base/include/irq_session/connection.h
index cdf3ada81..9f8ef004f 100644
--- a/repos/base/include/irq_session/connection.h
+++ b/repos/base/include/irq_session/connection.h
@@ -21,13 +21,6 @@ namespace Genode { struct Irq_connection; }
 
 struct Genode::Irq_connection : Connection<Irq_session>, Irq_session_client
 {
-
-	private:
-
-		Genode::Signal_receiver           _sig_rec;
-		Genode::Signal_context            _sigh_ctx;
-		Genode::Signal_context_capability _sigh_cap;
-
 	public:
 
 		/**
@@ -44,24 +37,8 @@ struct Genode::Irq_connection : Connection<Irq_session>, Irq_session_client
 			Connection<Irq_session>(
 				session("ram_quota=4K, irq_number=%u, irq_trigger=%u, irq_polarity=%u",
 				        irq, trigger, polarity)),
-			Irq_session_client(cap()),
-			_sigh_cap(_sig_rec.manage(&_sigh_ctx))
-		{
-			/* register default signal handler */
-			Irq_session_client::sigh(_sigh_cap);
-		}
-
-		~Irq_connection()
-		{
-			Irq_session_client::sigh(Genode::Signal_context_capability());
-			_sig_rec.dissolve(&_sigh_ctx);
-		}
-
-		/**
-		 * Convenience function to acknowledge last IRQ and to block calling
-		 * thread until next IRQ fires.
-		 */
-		void wait_for_irq();
+			Irq_session_client(cap())
+		{ }
 };
 
 #endif /* _INCLUDE__IRQ_SESSION__CONNECTION_H_ */
diff --git a/repos/base/src/base/irq/platform.cc b/repos/base/src/base/irq/platform.cc
index 73c837b01..14b85ab13 100644
--- a/repos/base/src/base/irq/platform.cc
+++ b/repos/base/src/base/irq/platform.cc
@@ -17,12 +17,3 @@ void Genode::Irq_session_client::ack_irq()
 {
 	call<Rpc_ack_irq>();
 }
-
-
-void Genode::Irq_connection::wait_for_irq()
-{
-	ack_irq();
-	Signal s = _sig_rec.wait_for_signal();
-	if (s.num() != 1)
-		PWRN("unexpected number of IRqs received %u", s.num());
-}