Revert "General tabui fixes"

This reverts commit ffde45b97b0c0a36907f02792e115b1e7329c21d.