Would just get rid of this component condition for a per-machine MSI.