Changes related to MCC done once again
Revert "Changes related to MCC done once again"

This reverts commit 2b89d602fde3cf5acd0e7348e2ef095521b258cc.