Deployer: Bug fix for plugin refactoring. REBASE OUT.