This issue is blocked by CDI-743 and unless a fix gets into CDI, we should not be fixing this on Weld side to avoid possible problems with multiple CDI providers on CP.