Revert "Merge pull request #5568 from bstansberry/WFLY-2609"

This reverts commit ee61561d8a8e6ceb384294bdb4ddec8c291a4a2f, reversing
changes made to f77c7de9c62ec3bf04ab81eedaa23af8adbe14b0.