Backout bug 908796 - the workaround from this bug is no longer required because we do not draw the closing tab anymore. rs=MattN, Gijs.