Revert "Add tab bar always"

This reverts commit f8695d24feb3791cdcbba4ced63d3659cdab3df9.