Revert "Actually fixed it"

This reverts commit 3546f37c9049aa1dbcc47745e5fa7f576e3e38bb.
Revert "Forgot to fix navigation highlighting"

This reverts commit 0018ca5d7e1d6d3fc6672387e9a4cef589e1d3b1.
Revert 3546f37..b6766ec

This rolls back to commit 3546f37c9049aa1dbcc47745e5fa7f576e3e38bb.