Revert "Replacing tray with taskbar"