Reverted to vanilla MAVProxy