Revert "Merge pull request #6237 from bstansberry/WFLY-2741-3058"

This reverts commit 56df5721bb734de8938f0024ab4865ae9b35d487, reversing
changes made to d2d25ce1e497e5522bfcf73aca0084e96fa2088a.