Revert "Navring: Make it optional [1/2]"

This reverts commit c2e539ec8813f7cea3dbe88eaac445cd8dc43f70.