revert mmc backport 3.0+