Revert parts of inadvertent previous checkin, keep build.xml and @Override changes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1629646 13f79535-47bb-0310-9956-ffa450edef68