Revert "Rolled back as navigation was jumping"

This reverts commit 91c25175c1511f7945c97532cd3472387543c2c9.