Revert "https://issues.jboss.org/browse/DTGOV-104"

This reverts commit f2c6c567ff972354b353a1d229418355c600fb24.
https://issues.jboss.org/browse/DTGOV-104