diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 2dfc67fd4d..4c79c67b4a 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -221,9 +221,6 @@ Mavlink::Mavlink() :
 
 Mavlink::~Mavlink()
 {
-	warnx("DESTRUCTOR");
-	usleep(1000000);
-
 	if (_task_running) {
 		/* task wakes up every 10ms or so at the longest */
 		_task_should_exit = true;
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h
index ffc69bc810..ccff6614f8 100644
--- a/src/modules/mavlink/mavlink_main.h
+++ b/src/modules/mavlink/mavlink_main.h
@@ -309,6 +309,6 @@ private:
 	/**
 	 * Main mavlink task.
 	 */
-	int		task_main(int argc, char *argv[]) __attribute__((noreturn));
+	int		task_main(int argc, char *argv[]);
 
 };