Just for clarification - is the removal of unicode here covered for Python 2x by the call to `decode` lower down in this diff?