Revert "HeadsUp: Correctly add and remove the window"