Revert "Merge branch 'new-navigation-prototype' into 'master'"

This reverts merge request !3494