unwind various changes made to build.xml that aren't necessary