Revert the changes from #3765 and adjust the navigation modules (see #6086)