I think this will actually revert those patches this time. I suck at git.
Merge pull request #1 from Harakou/whythehelldoesntthiswork

I think this will actually revert those patches this time. I suck at git...