revert 7af14ef and do not use __builtins__ which needs py3 change