Oops, wrong branch
Revert "refactor compiler plugin"

This reverts commit ad7fc697edaaf94f5ab17c323e70e6ad30992359.