Revert Squashed revert of MMC changes