diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index f970c493d41edd96b8af568116a02ffd0734f64d..3a8a18b566b3dd184f6ea2c32265b27719bf0bd8 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -201,14 +201,6 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
             // If the matching UAS object does not yet exist, it has to be created
             // before emitting the packetReceived signal
 
-            // BIG NASTY HACK
-            //TODO
-            //BUG
-            //BAD
-            //FIXME
-            if (message.sysid == 35)
-                message.sysid = 42;
-
             UASInterface* uas = UASManager::instance()->getUASForId(message.sysid);
 
             // Check and (if necessary) create UAS object