I think that this will require an update in GF/Payara integration. WELD-2404 fixed a problem for which a "workaround" probably exists in GF/Payara and this workaround should be removed now.