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

....