Revert f007bf7..8585c21

This rolls back to commit f007bf797b9f85c0138d1a39b14183feb9d485d1.
One Tab Bar Works