This reverts r1541641 + 1541746
Local variables are always thread safe, no needs to worry about them

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