Manual rollback of commit 67c06eae3a5146c11cca6fe30c5048e3387f952e since the simplified solution didn't always work. We're back to using ugly patches again, sorry :(
Solved name collision. I really hate the crappy way Python imports work.