Removal of build.xml hack only worked in IDE, so fix it properly