First usable version
Merge commit 'b55692f6acc45816eea0ef00f4d9c113debae72f' into normals_rendering
Revert "Merge with navigation"

This reverts commit a10729f7e22d2041f69b7d6ff3540c1fff395448, reversing
changes made to 1125f26f7c59979e71f8765efde700cb77b2669a.