ARIES-1068: backing out performance change due to some odd behaviour.

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