Revert non-py2-compat cmp crap
Ensure monkeypatched subprocess works again on py2
Missing six import