We do use window-number mode, put it back