Reverts r1407153 which was introduced for https://issues.apache.org/jira/browse/OFBIZ-3883. I will rather commit John's more cautious patch in branches