[CHANGE] reverting some changes made for disappearing tabs, because it was fixed otherwise in underlying source fork