instead of relying on forks. The patches themselves are from @TerrorJack's forks of the corresponding projects.