Bug 13618: followup to remove tabs