Revert "Merge branch 'M_Interface'"

This reverts commit a5dae2338c5a74816535cf47face2398dfc063a3, reversing
changes made to b6c2e08b43d0b77dd231e616e015a572bf4d8d5b.