JCR-3565: undo incorrect changes (ported to 2.6)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1469950 13f79535-47bb-0310-9956-ffa450edef68