Revert "WFLY-1548" which imports classes not available in some JDKs

This reverts commit b0683f6a4a01feab41f292c49de20f7e3d0a04c9.