This function has been moved to prevent an unintended dependency on CDI. Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit bdc847f1eb535a6728b6db3f2619d2a5ed0edbb9) Signed-off-by: Derek McGowan <derek@mcg.dev>