Revert fix of #3068.

Resolves issues with Import-Package of org.hibernate.* with version
[4.2,5).