Issue #85: Restore Python 2 compatiblity.