ms10: decom

RT #6169

Change-Id: Iac508188c40745162d06cf813577cc5a147af9c2