Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"

This reverts commit 4592de13bda5c825fc2a6065e8e4978330ceaca2, reversing
changes made to a309537e62aa938e483f8b21204f95da91244ed9.
Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification