Revert "Enhanced tabs"

This reverts commit eec5e1fc6c18f15239aaea4545f667468ef5b58f.