Patch from David Meggy to make the swap default to the new version if no