Re: msi: Revert commit 96e4320feb22b3a2c9564de100c09990622edb59