Reverting this change a bit for testing purposes.

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