RemoveNAV
Revert "RemoveNAV"

This reverts commit a2a68b7426bee739ba5917c4597a1aa1e2e4cf32.