diff --git a/ChangeLog b/ChangeLog
index d1af49d8b..1d56cb208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIApplication.m (-init): removed hack pertaining to
+	UnixSignalHandler since the class no longer exists.
+
 2012-03-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* Tools/SOGoToolUserPreferences.m (-run): we now take the proper
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index 8cdce056d..707e0f579 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -33,14 +33,6 @@
 
 MAPIApplication *MAPIApp = nil;
 
-@interface UnixSignalHandler : NSObject
-
-+ (id) sharedHandler;
-
-- (void) removeObserver: (id) observer;
-
-@end
-
 @implementation MAPIApplication
 
 + (BOOL) isCachingEnabled;
@@ -57,11 +49,6 @@ MAPIApplication *MAPIApp = nil;
 
       MAPIApp = [super init];
       [MAPIApp retain];
-
-      /* This is a hack to revert what is done in [WOCoreApplication
-         init] */
-      [[NSClassFromString (@"UnixSignalHandler") sharedHandler]
-                  removeObserver: self];
     }
 
   return MAPIApp;