https://bugs.winehq.org/show_bug.cgi?id=51420
--- Comment #30 from matt gardotd426@gmail.com --- Created attachment 71183 --> https://bugs.winehq.org/attachment.cgi?id=71183 Patch to revert the bad stuff.
This is a patch doing as best I can to revert the equivalent stuff from this commit (some of the stuff from the commit isn't even there to revert anymore but it's changed). This patch applies cleanly and the build succeeds. Also works with staging (obviously needs to be applied before staging's patchset is applied).