Revert "Fix plugins"

This reverts commit 49aab22a6b909b50889007910815c63d3d442cb5.