Cleanup from a botched merge
Include the COM Setup MSI