Revert "M3 progress"

This reverts commit ae0cb20aca4227b27ebd6f7f197fdeff772a739c.