NOTE: We should investigate the same for Weld 2.4. While we don't have the modules there, we also don't have the freedom to change package names in anything public. I haven't yet covered the extent to which it hinders us there.