Revert "Titlebar fix"