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

This reverts commit 85076b01a4aa3d420c204b13960f9d60180f9634.