[mcs] Undo project changes from dedb33eadeb87ca80cb86f48e6fa47da882507e3 due to XS stupidity