Bug 851436 - Revert tab strip logic by backing out patches for bug 837486, bug 649654, and bug 821859. r=dao