Temporary fix for wonkiness caused by new classpath search.