Revert r64426: caused bug 23581 (CollapsibleTabs breakage) for reasons noted in CR...