This reverts commit 6a7dd87f30. Reverting because the merge request was set to squash all together....
6a7dd87f30
MMPluginBase' and