Squashed revert of MMC changes