reverting OWB-931 after my tests, sorry if it had any side effect for you

git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/branches/owb_1.2.x@1565935 13f79535-47bb-0310-9956-ffa450edef68