Revert Changes to MMU back to CAF Merge