bring inline with Ethan and the rest of the guys in libinit_msm