Re-adding support for non anchor navigation.