Revert "Merge branch 'fix-python32' into devel"

This reverts commit 2dea63bcc6678108f3f3c501ba491e86857e068a, reversing
changes made to fd92febd33b657c51fcb57c2fe4ab3c8eb77ed8a.