Get rid of version testing and just use what will always work.