[subtree] Undo 3fe5d79 (broke navigation)