Fix: Remove monkey patching to progress with migration to Python3