The previous patch just reverted an older commit. This actually fixes the problem properly and will likely be merged upstream. [ci:skip-build]: already built successfully in CI