Let's put back the navigation behaviour and see if we can fix it upstrea...

...m