Revert "Fix after MSIM merges"

This reverts commit 8206d9c1c984cb2ea900e1ab4fbc8f41cbc660b7.