OAK-6841: Revert Changes made in OAK-6575 before 1.7.10 is released
OAK-6841: Revert Changes made in OAK-6575 before 1.7.10 is released

reverting r1811184

git-svn-id: 67138be12999c61558c3dd34328380c8e4523e73@1812702 13f79535-47bb-0310-9956-ffa450edef68

mduerig/jackrabbit-oak,mduerig/jackrabbit-oak,mduerig/jackrabbit-oak,mduerig/jackrabbit-oak,mduerig/jackrabbit-oak