Revert "Temporary workaround for WFLY-1285"

This reverts commit aa7bc48f450ba5062a4fdf8213b80668f5fd7869.
Revert "Temporary workaround for WFLY-1285"

This reverts commit 0167f3804d4c4b214e4cad987f50df958d418162.