diff --git a/libraries/AP_Scheduler/AP_Scheduler.cpp b/libraries/AP_Scheduler/AP_Scheduler.cpp
index 7de74f50aa..85c5b27a6f 100644
--- a/libraries/AP_Scheduler/AP_Scheduler.cpp
+++ b/libraries/AP_Scheduler/AP_Scheduler.cpp
@@ -87,11 +87,7 @@ void AP_Scheduler::run(uint16_t time_available)
                 task_fn_t func;
                 pgm_read_block(&_tasks[i].function, &func, sizeof(func));
                 current_task = i;
-#if APM_BUILD_FUNCTOR
                 func();
-#else
-                func();
-#endif
                 current_task = -1;
                 
                 // record the tick counter when we ran. This drives
diff --git a/libraries/AP_Scheduler/AP_Scheduler.h b/libraries/AP_Scheduler/AP_Scheduler.h
index 2ae9e5fd22..b929852fd3 100644
--- a/libraries/AP_Scheduler/AP_Scheduler.h
+++ b/libraries/AP_Scheduler/AP_Scheduler.h
@@ -41,11 +41,7 @@
 class AP_Scheduler
 {
 public:
-#if APM_BUILD_FUNCTOR
     FUNCTOR_TYPEDEF(task_fn_t, void);
-#else
-    typedef void (*task_fn_t)(void);
-#endif
 
     struct Task {
         task_fn_t function;