Revert "Merge commit 'refs/pull/5460/head' of github.com:wildfly/wildfly"

This reverts commit eab955383f9f0647f00e5782998de88600ec62a1, reversing
changes made to 3259a05a2ef9601f3515c5a1cc89f1a9cbd419a3.