Revert "Merge branch 'bfitzpat-JBTIS-347-4.2.x' into jbosstools-4.2.x"

This reverts commit bdf62a7c3fb15c089377506fdd2dc4b1442b95ae, reversing
changes made to 8ac0c990d75f88bec5f1484f990f5bcbed0dc069.