Don't patch bugs out, rewrite them out.