We should include changes from this commit to EAP. https://github.com/wildfly/wildfly/pull/4646/files
Verified on EAP 6.1.1 ER3