Revert potential break of issue 57 (python 3.2)