Removed renumber windows for 1.6.x compatibility