Revert "remove mcc calls"

This reverts commit adc5de78de3925f7d7bfb5bf72cd4c016d50790b.