Revert "wip: Implemented finer grained plugin hooks"

Until plugins have been rewritten, this change is in the hooks branch

This reverts commit e12cde57574394171d817366ec44a1e8ea94eec9.