Revert "Merged ClundXIII/NavEditor master"

This reverts commit 713964d189315a06821fe9c3fe8ac074d33f7848.