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

This reverts commit 2098221c904dc77eeede0cd2d7742d88d91a41e4.