Revert 1aff4f5..c267cfe

This rolls back to commit 1aff4f5767cb9532374d80342326534d0e45fea2.
New data driven nav