Setup should be able to take files from *any* directory listed in setup.ini, not just latest and/or contrib. If setup is confusing the location of things, that's a bug. However, look in your local directory first to see if you have spare copies of files in latest, and/or if you have a local setup.ini.