Revert "Enable software nav bar"

This reverts commit 5ddc596fdd24c9fb02ea79c95d7dc9f34a0a1df1.