Re: msi: Partially revert commit 26ae65898685a67f7be29cb94e679e4eb80fc6f5 [RESEND]