Reverted ant build script changes that screwed up the classpath.