diff --git a/src/uas/QGCMAVLinkUASFactory.cc b/src/uas/QGCMAVLinkUASFactory.cc
index ea5d02db14cdf71b46af1b62e7528bb5c071b513..a934e965b6e1410bbe9d4586663c177e7075e9ff 100644
--- a/src/uas/QGCMAVLinkUASFactory.cc
+++ b/src/uas/QGCMAVLinkUASFactory.cc
@@ -67,20 +67,21 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
         uas = px4;
     }
     break;
-    case MAV_AUTOPILOT_ARDUPILOTMEGA:
-    {
-        ArduPilotMegaMAV* mav = new ArduPilotMegaMAV(mavlink, worker, sysid);
-        // Set the system type
-        mav->setSystemType((int)heartbeat->type);
-
-        // Connect this robot to the UAS object
-        // it is IMPORTANT here to use the right object type,
-        // else the slot of the parent object is called (and thus the special
-        // packets never reach their goal)
-        connect(mavlink, SIGNAL(messageReceived(LinkInterface*, mavlink_message_t)), mav, SLOT(receiveMessage(LinkInterface*, mavlink_message_t)));
-        uas = mav;
-    }
-    break;
+    // XXX the APM support needs polishing before it can be shown to users
+//    case MAV_AUTOPILOT_ARDUPILOTMEGA:
+//    {
+//        ArduPilotMegaMAV* mav = new ArduPilotMegaMAV(mavlink, worker, sysid);
+//        // Set the system type
+//        mav->setSystemType((int)heartbeat->type);
+
+//        // Connect this robot to the UAS object
+//        // it is IMPORTANT here to use the right object type,
+//        // else the slot of the parent object is called (and thus the special
+//        // packets never reach their goal)
+//        connect(mavlink, SIGNAL(messageReceived(LinkInterface*, mavlink_message_t)), mav, SLOT(receiveMessage(LinkInterface*, mavlink_message_t)));
+//        uas = mav;
+//    }
+//    break;
 #ifdef QGC_USE_SENSESOAR_MESSAGES
 	case MAV_AUTOPILOT_SENSESOAR:
 		{