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

This reverts commit 589565f0f57c1a583c92fb3b874218ae8bae53b0.