Reverted revision 1480891 and fixed the problem it tried to fix.


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