Reworked my branch to apply the patches from Mike Hommey (see upstream bug), which seem to apply properly and correctly fix the issue.
Reworked my branch to apply the patches from Mike Hommey (see upstream bug), which seem to apply properly and correctly fix the issue.