Revert "Add and Activate NavBar Support"

This reverts commit 57540fbc2171eb88012e006ac6aae180940250ea.