Revert "Revert "https://issues.jboss.org/browse/JBTM-1511""

This reverts commit 3645c351c0bf92af2a5f7549576558906991ceea.