Revert "rewrite of NDP proxy" for now