Updated for JBossTS 4.17.3.Final