Revert misunderstood add of dependences + partially py3 compatibility changes
2 files changed