diff --git a/ArduPlane/afs_plane.cpp b/ArduPlane/afs_plane.cpp
index 9a28af203f..a9fc46da47 100644
--- a/ArduPlane/afs_plane.cpp
+++ b/ArduPlane/afs_plane.cpp
@@ -18,12 +18,12 @@ void AP_AdvancedFailsafe_Plane::terminate_vehicle(void)
     plane.g2.servo_channels.disable_passthrough(true);
     
     // and all aux channels
-    SRV_Channels::set_output_limit(SRV_Channel::k_flap_auto, SRV_Channel::SRV_CHANNEL_LIMIT_MAX);
-    SRV_Channels::set_output_limit(SRV_Channel::k_flap, SRV_Channel::SRV_CHANNEL_LIMIT_MAX);
-    SRV_Channels::set_output_limit(SRV_Channel::k_aileron, SRV_Channel::SRV_CHANNEL_LIMIT_MIN);
-    SRV_Channels::set_output_limit(SRV_Channel::k_rudder, SRV_Channel::SRV_CHANNEL_LIMIT_MAX);
-    SRV_Channels::set_output_limit(SRV_Channel::k_elevator, SRV_Channel::SRV_CHANNEL_LIMIT_MAX);
-    SRV_Channels::set_output_limit(SRV_Channel::k_elevator_with_input, SRV_Channel::SRV_CHANNEL_LIMIT_MAX);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_flap_auto, 100);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_flap, 100);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_aileron, SERVO_MAX);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_rudder, SERVO_MAX);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_elevator, SERVO_MAX);
+    SRV_Channels::set_output_scaled(SRV_Channel::k_elevator_with_input, SERVO_MAX);
     SRV_Channels::set_output_limit(SRV_Channel::k_manual, SRV_Channel::SRV_CHANNEL_LIMIT_TRIM);
     SRV_Channels::set_output_limit(SRV_Channel::k_none, SRV_Channel::SRV_CHANNEL_LIMIT_TRIM);
 
diff --git a/ArduPlane/servos.cpp b/ArduPlane/servos.cpp
index c318fabee4..42c5820824 100644
--- a/ArduPlane/servos.cpp
+++ b/ArduPlane/servos.cpp
@@ -725,9 +725,9 @@ void Plane::set_servos(void)
         // after an auto land and auto disarm, set the servos to be neutral just
         // in case we're upside down or some crazy angle and straining the servos.
         if (landing.get_then_servos_neutral() == 1) {
-            SRV_Channels::set_output_limit(SRV_Channel::k_aileron, SRV_Channel::SRV_CHANNEL_LIMIT_TRIM);
-            SRV_Channels::set_output_limit(SRV_Channel::k_elevator, SRV_Channel::SRV_CHANNEL_LIMIT_TRIM);
-            SRV_Channels::set_output_limit(SRV_Channel::k_rudder, SRV_Channel::SRV_CHANNEL_LIMIT_TRIM);
+            SRV_Channels::set_output_scaled(SRV_Channel::k_aileron, 0);
+            SRV_Channels::set_output_scaled(SRV_Channel::k_elevator, 0);
+            SRV_Channels::set_output_scaled(SRV_Channel::k_rudder, 0);
         } else if (landing.get_then_servos_neutral() == 2) {
             SRV_Channels::set_output_limit(SRV_Channel::k_aileron, SRV_Channel::SRV_CHANNEL_LIMIT_ZERO_PWM);
             SRV_Channels::set_output_limit(SRV_Channel::k_elevator, SRV_Channel::SRV_CHANNEL_LIMIT_ZERO_PWM);