Revert "Change checkboxes as well for MSIM"

This reverts commit 6057d8c950aa28b33a27cc4c7469063b9ff8cca6.