I'm concerned about these changes and associated regressions. Maybe @gtorodelvalle can have a look at this as he knows better than me the navigation.js code