Revert "Replacing reference to deprecated PluginManagerHolder"

This reverts commit 2b8498cf6a77b5d79bd5dd56fdaa12ef0dd8893d.