Revert "improved msi"

This reverts commit 7eac2121a54b8859aecbd5af37ef3adcec4d5da7.