Revert "Merge pull request #6168 from bafco/WFLY-3260"

This reverts commit bbef047b4b0e8ca972197d3cf9b1d8f93913efdf, reversing
changes made to def4ef6a0aaf22b73693e00c2c6f3f44d2e11dc2.