Revert "General tabui fixes"

This reverts commit 7c60b8aba1d9ea4d0b4bcb0cb6dbbd556f202eb2.