This commit reverts b1042d318446601d57 Yeah calling redraw still causes too many issues like #781 #788 fixes #788