Since this was urgent for infinipan, https://issues.jboss.org/browse/ISPN-3335 uses a workaround. Also added https://issues.jboss.org/browse/ISPN-3782 to re-address once a proper fix is available.