CONN-137, remove unneeded force repaint hacks