Revert r1379389 it was incomplete and need more work, see https://issues.apache.org/jira/browse/OFBIZ-5020#comment-13446639