PDFBOX-2277: revert previous commit (except cleanup)

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/branches/1.8@1619855 13f79535-47bb-0310-9956-ffa450edef68