Revert "Merge branch 'master' of https://github.com/Lily44/mctc_and_redo"

This reverts commit 6b511a82cbd7888f4c6cc51eebcd02e23b35bae7.