Revert "Old mt/mp. It works?"

This reverts commit 4456e4cc72a04031e83287f5da67bb0275862f22.