Re-fix the __builtin__ fix, again