SLING-2944 - Revert accidentally committed additional changes from rev 1525411

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