Sigh, fix py3k merge conflict mux up