OPENDJ-1607 Revert changes to revision 11339

git-svn-id: https://svn.forgerock.org/opendj/trunk/opendj@11357 41b1ffd8-f28e-4786-ab96-9950f0a78031