AP_NPS: just saving work for now -- need to interactive rebase later