Revert "Disable navbar options if force navbar option is not enabled"

This reverts commit a08a5d1dc5a79735c16d986e9f011a7b8aad0137.