Completes r1557447, the annoyances of blind reverting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1557457 13f79535-47bb-0310-9956-ffa450edef68