Revert 019c8e5..12750ee

This rolls back to commit 019c8e5a132895c69fd0847af385463344a9e57e.
ok navigation should be fine now