since this is always > 7.1 client, shouldn't we remove this hack in wildfly 8 ?