Merge "Remove crusty old python 3 package version logic"