The intention is to address https://issues.jboss.org/browse/WFLY-689