Make 74e1b305e4753eb999116708990161956de41cf9 py3 compatible