Adding back in a way for NS2+ and CompMod to live in harmony.