TEIIDDES-2011 reverted changes. Issue is with Modeshape client jar.