Do not use msim

Change-Id: I6df3725aee483796049b3c58a133f04dec42df90