Redo previous Py3k-incompatible fix the Right Way