Revert r1449615, which was only a partial solution. See https://issues.apache.org/jira/browse/OFBIZ-5163 for a discussion.

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