Revert MSIM commits