Reverts revisions: 1525910 + 1526535, OFBIZ-4794 is not yet ready

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