Revert "Merge pull request #132 from heroku/schneems/less-inheritance-in-plugins"

This reverts commit 968736e977fcb54705d2fe2a95f11f2192026d17, reversing
changes made to 34f5f706158d55fbeabc548c5fbd0f851e547fd6.

Still some issues with this Pull Request. Going to work on it some more.