Revert "Using JPA 2.1 descriptor (TODO: Change to common interface)"

This reverts commit 9b507e5b93bb0eeaa878dcb054e500521372a187.