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

This reverts commit 1acc7ae0673749547845f290bb7bab1967dbd71e.