Revert "Fix after MSIM merges"

This reverts commit 3ed6a4ab80d4a1c0d68d14c3174cca9b1c624ef3.