Bug 8798: (follow-up) remove tabs