Revert r1647523. This is not the right solution said Scott on dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1647543 13f79535-47bb-0310-9956-ffa450edef68