FIX: revert docs and fix for py3 compat