Revert "Merge pull request #6785 from mareknovotny/WFLY-3937"

This reverts commit 73f1c64a276fecfbef21ab414a12496651887a89, reversing
changes made to 473611d95d4339c0a4ffdd2872f7d6609c2d63a2.

Internal discussions lead to this being reverted in the product.
Original PR was https://github.com/wildfly/wildfly/pull/6785