Revert "Use the patch for building with mingw 8.2"
This reverts commit 90d95e9224b3f7331405192dc98c9f87b468898d.