d4de925ec7
and remove default navigation classes in favor of the navigation classes
(cherry picked from commit b63d24ac1a)