[temp] restore nav* until wer have something better

Change-Id: I8bcca095666e27819e8ecf55f42b16baa9d1976f