This seems rather a large change for a simple bug fix ... Perhaps you could just extract the patch that fixes the bug instead? -- ImportError: No module named implementations https://launchpad.net/bugs/54074