undo a couple un-necessary changes and, hopefully, get this working with python2 again