Revert "rewrite of NDP proxy" for now
Merge remote-tracking branch 'upstream/master'