OPENJPA-2285: Revert prior changes.

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