Revert "Merge pull request #6172 from stuartwdouglas/WFLY-2569"

This reverts commit 73cd0fee7f8f83959a54d2925efdc520d377e2ef, reversing
changes made to 3ccbd9b18eddcd56ec70cf5022ce80a229457070.