Revert "Merge branch '1946-improved-plugin-mechanism' into 'develop'"

Lauri Himanenrequested to merge
revert-7bef9579 into develop

This reverts merge request !1803 (merged)

Merge request reports