Revert "removed JPA-incompatible components for now"

This reverts commit d3fa80083495de2a292cb4cef6f3dd54afc50537.