Reverts revisions: 1525907 + 1526536, OFBIZ-4794 is not yet ready

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1526645 13f79535-47bb-0310-9956-ffa450edef68