PDFBOX-2057: revert last 2 changes

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