Can someone reformulate this as a patch and see if it works on Windows (and does not break other things)?